diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java b/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java index 02be69aa..8c9c099b 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java @@ -274,7 +274,12 @@ public class ApmController { if (StringUtil.isEmpty(cmmVO.getSearchStartDt())) { // 조회일시가 null인경우 Date today = new Date(); - cmmVO.setSearchStartDt(DateFormatUtils.format(DateUtils.addMonths(today, -1), "yyyyMMdd")); + //조정진행목록 보이는 화면 수정 요청_230524 + int month = -1; + if(StringUtil.isNotEmpty(cmmVO.getSearchMonth())) { + month = -(Integer.valueOf(cmmVO.getSearchMonth())); + } + cmmVO.setSearchStartDt(DateFormatUtils.format(DateUtils.addMonths(today, month), "yyyyMMdd")); cmmVO.setSearchEndDt(DateFormatUtils.format(today, "yyyyMMdd")); } diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/PgrCmmVO.java b/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/PgrCmmVO.java index 4989a618..4a0d9118 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/PgrCmmVO.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/PgrCmmVO.java @@ -169,6 +169,8 @@ public class PgrCmmVO extends ComDefaultVO implements Serializable { private String dntDetailType;//4DntDetailType(기일지정상세화면) / NoDntDetailType(이외) + private String orderByYn; + public String getAdrAdmId() { return adrAdmId; } @@ -1184,6 +1186,16 @@ public class PgrCmmVO extends ComDefaultVO implements Serializable { public void setDntDetailType(String dntDetailType) { this.dntDetailType = dntDetailType; } + + public String getOrderByYn() { + return orderByYn; + } + + public void setOrderByYn(String orderByYn) { + this.orderByYn = orderByYn; + } + + diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/dlvinfo/web/DlvinfoController.java b/src/main/java/kcc/kccadr/adjPgrMgr/dlvinfo/web/DlvinfoController.java index 27450822..f38964b5 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/dlvinfo/web/DlvinfoController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/dlvinfo/web/DlvinfoController.java @@ -167,8 +167,11 @@ public class DlvinfoController { */ @RequestMapping(value = "dlvinfoDetail.do") public String dlvinfoDetail(@ModelAttribute("dlvinfoVO") DlvinfoVO dlvinfoVO, ModelMap model) throws Exception { - - model.addAttribute("info", dlvinfoService.selectAdjustDeliveryInfo(dlvinfoVO)); + DlvinfoVO info = dlvinfoService.selectAdjustDeliveryInfo(dlvinfoVO); + + System.out.println("info.getRecDeTime() :: "+info.getRecDeTime()); + + model.addAttribute("info", info); return "/kccadr/adjPgrMgr/dlvinfo/dlvinfoDetail"; } @@ -512,10 +515,11 @@ public class DlvinfoController { /* * if(apmVO.getPageUnit() != 10) { apmVO.setPageUnit(apmVO.getPageUnit()); } */ - if (StringUtil.isEmpty(cmmVO.getSearchSortCnd())) { // 최초조회시 최신것 조회List - cmmVO.setSearchSortCnd("M.ADR_SEQ"); +// if (StringUtil.isEmpty(cmmVO.getSearchSortCnd())) { // 최초조회시 최신것 조회List + cmmVO.setOrderByYn("Y"); + cmmVO.setSearchSortCnd("M.ADR_NO"); cmmVO.setSearchSortOrd("desc"); - } +// } if (StringUtil.isEmpty(cmmVO.getSearchStartDt())) { // 조회일시가 null인경우 디폴트로 12개월 동안의 기간으로 검색함 Date today = new Date(); diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/cmm/Cmm_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/cmm/Cmm_SQL_Mysql.xml index 157d8435..7eae41e3 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/cmm/Cmm_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/cmm/Cmm_SQL_Mysql.xml @@ -131,6 +131,10 @@ + + + ORDER BY $searchSortCnd$ $searchSortOrd$ + LIMIT #recordCountPerPage# OFFSET #firstIndex# diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/dlvinfo/Dlvinfo_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/dlvinfo/Dlvinfo_SQL_Mysql.xml index a44d509a..e780279d 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/dlvinfo/Dlvinfo_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/dlvinfo/Dlvinfo_SQL_Mysql.xml @@ -110,9 +110,9 @@ , D.ADR_SN as adrSn , D.DLVRY_SEQ as dlvrySeq , TO_CHAR ( D.SEND_DE, 'YYYY/MM/DD' ) as sendDeDay /* 발송일시 (송달일시) */ - , TO_CHAR ( D.SEND_DE, 'HH24:MI:SS' ) as sendDeTime /* 발송일시 (송달일시) */ + , TO_CHAR ( D.SEND_DE, 'HH24:MI' ) as sendDeTime /* 발송일시 (송달일시) */ , TO_CHAR ( D.REC_DE, 'YYYY/MM/DD' ) as recDeDay /* 송달일시 (송달완료일시) */ - , TO_CHAR ( D.REC_DE, 'HH24:MI:SS' ) as recDeTime /* 송달일시 (송달완료일시) */ + , TO_CHAR ( D.REC_DE, 'HH24:MI' ) as recDeTime /* 송달일시 (송달완료일시) */ , MDM.MEM_DEPT_NM as memDeptNm /* 조정부명 */ , MD.ADR_SN as adrSn /* 조정회차 (조정차수) */ , M.ADR_NO as adrNo /* 조정 사건번호 */ @@ -197,7 +197,7 @@ , REC_DE = #recDeDay#||#recDeTime# , REG_NM = #regNm# , LAST_UPDUSR_ID = #lastUpdusrId# - , LAST_UPDT_PNTTM = SYS_DATETIME + , LAST_UPDT_PNTTM = NOW() , DLVRY_DOC_TY = #dlvryDocTy# WHERE ADR_SEQ = #adrSeq# AND ADR_SN = #adrSn# diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dlvinfo/dlvinfoDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dlvinfo/dlvinfoDetail.jsp index 68a4ab05..0df09747 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dlvinfo/dlvinfoDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dlvinfo/dlvinfoDetail.jsp @@ -38,8 +38,18 @@ } function fncUpd() { + + var f = document.getElementById("listForm"); + + f.sendDeTime.value = f.sendDeTime.value + ':00'; + + if(f.recDeTime.value != ''){ + f.recDeTime.value = f.recDeTime.value + ':00'; + } + var varFrom = document.getElementById("listForm"); var data = new FormData(varFrom); + if (isValid()) { if (confirm("송달 정보를 수정하시겠습니까?")) { diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgr/adjReqMgrRegEdit.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgr/adjReqMgrRegEdit.jsp index c905a003..8cd972e5 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgr/adjReqMgrRegEdit.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgr/adjReqMgrRegEdit.jsp @@ -48,7 +48,7 @@ //대리인 이메일 및 연락처 구분 처리해주기 var rppl00Email = $('#rppl00Email').val(); - var rppl00Phone = addDash($('#rppl00Phone').val()); + var rppl00Phone = formatPhoneNumber($('#rppl00Phone').val()); var splEmail00 = []; splEmail00 = rppl00Email.split("@"); @@ -74,7 +74,7 @@ //신청인 이메일 및 연락처 구분 처리해주기 var rppl01Email = $('#rppl01Email').val(); - var rppl01Phone = addDash($('#rppl01Phone').val()); + var rppl01Phone = formatPhoneNumber($('#rppl01Phone').val()); var splEmail01 = []; splEmail01 = rppl01Email.split("@"); @@ -131,7 +131,7 @@ //피신청인2 ~ 5 이메일 및 연락처 구분 처리해주기 var rpplEmail = $('#rppl0'+ num +'Email').val(); - var rpplPhone = addDash($('#rppl0'+ num +'Phone').val()); + var rpplPhone = formatPhoneNumber($('#rppl0'+ num +'Phone').val()); var splEmail = []; splEmail = rpplEmail.split("@"); @@ -180,7 +180,7 @@ //피신청인1 이메일 및 연락처 구분 처리해주기 var rppl02Email = $('#rppl02Email').val(); - var rppl02Phone = addDash($('#rppl02Phone').val()); + var rppl02Phone = formatPhoneNumber($('#rppl02Phone').val()); var splEmail02 = []; splEmail02 = rppl02Email.split("@"); diff --git a/src/main/webapp/js/kccadr/kccadrCom.js b/src/main/webapp/js/kccadr/kccadrCom.js index 7dfa1616..9e17490e 100644 --- a/src/main/webapp/js/kccadr/kccadrCom.js +++ b/src/main/webapp/js/kccadr/kccadrCom.js @@ -335,9 +335,31 @@ function commonPopWindowopenForm(surl, popupwidth, popupheight, name, frm) { //휴대폰 번호에 대쉬(-) 추가해주기 function addDash(str) { + alert(str + "::" + str.length); + if(str.length == 10){ + alert("in :: " + str.replace(/^(0(2|3[1-3]|4[1-4]|5[1-5]|6[1-4]))-(\d{3,4})-(\d{4})$/, "$1-$2-$3")); + return str.replace(/^(0(2|3[1-3]|4[1-4]|5[1-5]|6[1-4]))-(\d{3,4})-(\d{4})$/).replace("--", "-"); + } return str.replace(/(^01[016789]{1}|070)([0-9]{3}|[0-9]{4})([0-9]{4})$/, "$1-$2-$3").replace("--", "-"); } +const formatPhoneNumber = (input) => { + const cleanInput = input.replaceAll(/[^0-9]/g, ""); + let result = ""; + const length = cleanInput.length; + if(length === 8) { + result = cleanInput.replace(/(\d{4})(\d{4})/, '$1-$2'); + } else if(cleanInput.startsWith("02") && (length === 9 || length === 10)) { + result = cleanInput.replace(/(\d{2})(\d{3,4})(\d{4})/, '$1-$2-$3'); + } else if(!cleanInput.startsWith("02") && (length === 10 || length === 11)) { + result = cleanInput.replace(/(\d{3})(\d{3,4})(\d{4})/, '$1-$2-$3'); + } else { + result = undefined; + } + console.log(`${input} -> ${result}`); + return result; +} + //null 체크 function isEmpty(value) { if (value == "" || value == null || value == undefined || (value != null && typeof value == "object" && !Object.keys(value).length)) { return true } else { return false }