diff --git a/src/main/java/kcc/kccadr/adjReqMgrOff/service/AdjReqMgrOffLineVO.java b/src/main/java/kcc/kccadr/adjReqMgrOff/service/AdjReqMgrOffLineVO.java index 212339e3..081d975a 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrOff/service/AdjReqMgrOffLineVO.java +++ b/src/main/java/kcc/kccadr/adjReqMgrOff/service/AdjReqMgrOffLineVO.java @@ -58,6 +58,7 @@ public class AdjReqMgrOffLineVO extends ComDefaultVO implements Serializable { private String rpplTy = ""; // 관리인구분 private String agntYn = ""; // 조정기일대리여부 private String rpplUsrTy = ""; // 관리인분류 + private String rpplUsrDiv = ""; // 관리인분류 private String adrOlYn = ""; // 전자조정진행여부 private String rpplId = ""; // 조정사건관리인ID private String rpplNm = ""; // 이름_대표자 @@ -403,6 +404,12 @@ public class AdjReqMgrOffLineVO extends ComDefaultVO implements Serializable { public void setRpplUsrTy(String rpplUsrTy) { this.rpplUsrTy = rpplUsrTy; } + public String getRpplUsrDiv() { + return rpplUsrDiv; + } + public void setRpplUsrDiv(String rpplUsrDiv) { + this.rpplUsrDiv = rpplUsrDiv; + } public String getAdrOlYn() { return adrOlYn; } diff --git a/src/main/java/kcc/kccadr/adjReqMgrOff/service/impl/AdjReqMgrOffLineServiceImpl.java b/src/main/java/kcc/kccadr/adjReqMgrOff/service/impl/AdjReqMgrOffLineServiceImpl.java index bc5ca2c6..0d6d4aaf 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrOff/service/impl/AdjReqMgrOffLineServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjReqMgrOff/service/impl/AdjReqMgrOffLineServiceImpl.java @@ -684,7 +684,6 @@ public String insertAdjReqMgrRpplReq(AdjReqMgrOffLineVO adjReqMgrOffLineVO) thro adjReqMgrOffLineVO.setRpplRealPost(rpplRealPost); adjReqMgrOffLineVO.setRpplRealAddr(rpplRealAddr); adjReqMgrOffLineVO.setRpplRealAddrDtl(rpplRealAddrDtl); - //디비에 수정해 주기 int resultCnt = adjReqMgrOffLineDAO.updateAdjReqMgrOffRppl(adjReqMgrOffLineVO); diff --git a/src/main/java/kcc/kccadr/adjreqmgr/service/AdjReqMgrVO.java b/src/main/java/kcc/kccadr/adjreqmgr/service/AdjReqMgrVO.java index 0c185060..903df778 100644 --- a/src/main/java/kcc/kccadr/adjreqmgr/service/AdjReqMgrVO.java +++ b/src/main/java/kcc/kccadr/adjreqmgr/service/AdjReqMgrVO.java @@ -148,7 +148,9 @@ public class AdjReqMgrVO extends ComDefaultVO implements Serializable{ private String appliCantNm; private String rpplUsrTyNm; - + + private String rpplUsrDivNm; + private String edtSn; private String edtTy; @@ -806,6 +808,14 @@ public class AdjReqMgrVO extends ComDefaultVO implements Serializable{ this.rpplUsrTyNm = rpplUsrTyNm; } + public String getRpplUsrDivNm() { + return rpplUsrDivNm; + } + + public void setRpplUsrDivNm(String rpplUsrDivNm) { + this.rpplUsrDivNm = rpplUsrDivNm; + } + public String getEdtSn() { return edtSn; } diff --git a/src/main/java/kcc/kccadr/adjreqmgr/web/AdjReqMgrController.java b/src/main/java/kcc/kccadr/adjreqmgr/web/AdjReqMgrController.java index d97dc1b9..9f96a513 100644 --- a/src/main/java/kcc/kccadr/adjreqmgr/web/AdjReqMgrController.java +++ b/src/main/java/kcc/kccadr/adjreqmgr/web/AdjReqMgrController.java @@ -1090,7 +1090,7 @@ public class AdjReqMgrController { //조정 신청 정보 불러오기. AdjReqMgrOffLineVO resultAdjReqMgrOffLine = adjReqMgrOffLineService.selectAdjReqMgrOffLineInfo(adjReqMgrOffLineVO); - + System.out.println("=========================="); FileVO fileVO = new FileVO(); if(resultAdjReqMgrOffLine.getAdjReqMgrVoList().get(0).getAtchFileId() != null){ @@ -1117,6 +1117,8 @@ public class AdjReqMgrController { List> codeResult = cmmUseService.selectCmmCodeDetail("CC001"); model.addAttribute("CC001", codeResult); + model.addAttribute("CC007", cmmUseService.selectCmmCodeDetail("CC007")); + System.out.println("resultAdjReqMgrOffLine :: "+ resultAdjReqMgrOffLine.getAdjReqMgrVoList().get(2)); model.addAttribute("adrVO", resultAdjReqMgrOffLine); diff --git a/src/main/java/kcc/kccadr/message/SchedulerUtil.java b/src/main/java/kcc/kccadr/message/SchedulerUtil.java index 05a9e665..7737a76e 100644 --- a/src/main/java/kcc/kccadr/message/SchedulerUtil.java +++ b/src/main/java/kcc/kccadr/message/SchedulerUtil.java @@ -67,7 +67,7 @@ public class SchedulerUtil { @Scheduled(cron = "0 0/1 * * * *") // @SchedulerLock(name = "kakaoAtSendPrcs", lockAtMostForString = ONE_MIN, lockAtLeastForString = ONE_MIN) public void kakaoAtSendPrcs() throws Exception { - System.out.println("===========at scheduler run============"); +// System.out.println("===========at scheduler run============"); String hostAddr = null; @@ -91,7 +91,7 @@ public class SchedulerUtil { } try { - System.out.println("server ip ============" + hostAddr); +// System.out.println("server ip ============" + hostAddr); // if(hostAddr.equals(myLocalIp) || hostAddr.equals(devOutIp) || hostAddr.equals(devInIp) || hostAddr.equals(dmzIp1) || hostAddr.equals(dmzIp2) || hostAddr.equals(containerIp) ) { // if(hostAddr.equals(containerIp) ) { @@ -121,7 +121,7 @@ public class SchedulerUtil { System.out.println(e.getMessage()); } - System.out.println("===========at scheduler finish============"); +// System.out.println("===========at scheduler finish============"); } @Bean diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgr/AdjReqMgr_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgr/AdjReqMgr_SQL_Mysql.xml index 002f0be3..fd5bfc20 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgr/AdjReqMgr_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgr/AdjReqMgr_SQL_Mysql.xml @@ -499,11 +499,13 @@ LAST_UPDT_PNTTM AS lastUpdtPnttm, LAST_UPDUSR_ID AS lastUpdusrId, RPPL_USR_TY_NM AS rpplUsrTyNm, + RPPL_USR_DIV_NM AS rpplUsrDivNm, ORD_NUM FROM ( SELECT * , ( SELECT CODE_NM FROM LETTCCMMNDETAILCODE WHERE CODE_ID = 'CC001' AND CODE = T1.RPPL_USR_TY) AS RPPL_USR_TY_NM + , ( SELECT CODE_NM FROM LETTCCMMNDETAILCODE WHERE CODE_ID = 'CC007' AND CODE = T1.RPPL_USR_DIV) AS RPPL_USR_DIV_NM , CASE WHEN RPPL_TY = '01' THEN 2 WHEN RPPL_TY = '03' THEN 1 ELSE 3 END ORD_NUM FROM ADR_RPPL T1 WHERE ADR_SEQ = #adrSeq# diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgrOff/AdjReqMgrOff_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgrOff/AdjReqMgrOff_SQL_Mysql.xml index 1c077137..14a2eb19 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgrOff/AdjReqMgrOff_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgrOff/AdjReqMgrOff_SQL_Mysql.xml @@ -179,6 +179,7 @@ RPPL_TY AS rpplTy, AGNT_YN AS rpplYn, RPPL_USR_TY AS rpplUsrTy, + RPPL_USR_DIV as rpplUsrDiv, ADR_OL_YN AS adrOlYn, RPPL_ID AS rpplId, RPPL_NM AS rpplNm, @@ -258,6 +259,7 @@ RPPL_TY = #rpplTy# ,AGNT_YN = #agntYn# ,RPPL_USR_TY = #rpplUsrTy# + ,RPPL_USR_DIV = #rpplUsrDiv# ,RPPL_NM = #rpplNm# ,RPPL_BIZ_NO = #rpplBizNo# ,RPPL_BIZ_ID = #rpplBizId# diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp index a622b55f..f7c46be6 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp @@ -2175,6 +2175,14 @@ $(document).ready(function(){
신청인 구분
+신청인 분류
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgr/adjReqMgrRegDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgr/adjReqMgrRegDetail.jsp index 40cc4550..0ae27375 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgr/adjReqMgrRegDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgr/adjReqMgrRegDetail.jsp @@ -276,6 +276,14 @@신청인 구분
+신청인 분류
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 31e47a15..19625b9f 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgr/adjReqMgrRegEdit.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgr/adjReqMgrRegEdit.jsp @@ -375,9 +375,14 @@ $("#agntInfo").show(); $("#agntInfo input").prop("disabled", false); + $("#rpplUsrDivTr").show(); + } else { $("#agntInfo").hide(); $("#agntInfo input").prop("disabled", true); + // 대리인이 아니고 본인일 경우 신청인 구분 (한국인 / 외국인) hide + $("#rpplUsrDivTr").hide(); + } }); @@ -619,6 +624,11 @@ } } + + if(rpplTy == '30'){ //조정신청 대상 대리인 + + var rpplUsrDiv = $("[name='adjReqMgrVoList[1].rpplUsrDiv']:checked").val(); //신청인 분류 + } var rpplUsrTy = $("[name='adjReqMgrVoList[1].rpplUsrTy']:checked").val(); //신청인 분류 @@ -1676,7 +1686,7 @@|
필수입력 항목* 우편물 수령지 + ※ 기일통지서, 답변서 등 조정진행 관련 문서들이 우편으로 발송됩니다. 실제 우편물 수령이 가능한 주소를 입력하시기 바랍니다. |
diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstReqRegistStep3.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstReqRegistStep3.jsp index 6403673a..2ca7b4f1 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstReqRegistStep3.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstReqRegistStep3.jsp @@ -83,7 +83,8 @@ $( document ).ready(function(){ $('.temporaryBtn').click(function(){ console.log($(this).hasClass('udpate')); - if(confirm("신청인 취지/원인 정보 임시저장을 진행하시겠습니까?")) +// if(confirm("신청인 취지/원인 정보 임시저장을 진행하시겠습니까?")) + if(confirm("입력하신 피신청인 정보를 임시 저장하시겠습니까?")) { if(confirm("신청인 취지/원인 정보 임시저장이 완료되었습니다.\n다음 페이지로 이동하시겠습니까?")) { @@ -180,12 +181,12 @@ function fn_adjstReq_preview() { |
|---|---|
|
- 소명자료1 +소명자료 신청취지 또는 신청이유를 객관적으로 소명할 수 있는 근거자료를 파일로 첨부합니다. |
- (*파일 종류 및 수량에 지한이 없습니다.) + (*파일 종류 및 수량에 제한이 없습니다.) |