From 78d717adae3ac19f249dae2ac46f587fd44ed366 Mon Sep 17 00:00:00 2001 From: hylee Date: Fri, 14 Oct 2022 12:10:57 +0900 Subject: [PATCH] =?UTF-8?q?feat:[=EB=8C=80=EA=B5=AD=EB=AF=BC]=EB=8B=B5?= =?UTF-8?q?=EB=B3=80=EC=84=9C=20=EC=98=88=EB=AC=B8=20=ED=8C=9D=EC=97=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adjst/web/AdjstReqWebController.java | 15 ++++++---- .../web/AdjstExpDetailController.java | 2 +- .../jsp/web/kccadr/accdnt/ans/ansSubmit.jsp | 4 +-- .../adjst/popup/adjstReqOpenExamplePop.jsp | 21 +++++++------- .../kccadr/kccadrCom/kccadrConstantsJsp.jsp | 28 +++++++++++-------- 5 files changed, 41 insertions(+), 29 deletions(-) diff --git a/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java b/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java index 4b47561e..260ed2b2 100644 --- a/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java +++ b/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java @@ -259,8 +259,6 @@ public class AdjstReqWebController { @RequestMapping("/web/kccadr/adjst/popup/adjstReqOpenExamplePopCn.do") public ResponseEntity adjstReqOpenExamplePopCn(@RequestBody AdjstReqVO adjstReqVO) throws Exception { - System.out.println("adjstReqVO.getExmpCd() :: "+ adjstReqVO.getExmpCd()); - System.out.println("adjstReqVO.getExmpCcTy() :: "+ adjstReqVO.getExmpCcTy()); AdjstReqVO exmp = adjstReqService.selectAdjstReqOpenExamplePopCn(adjstReqVO); // if (exmp != null && StringUtils.isNotBlank(exmp.getAtchFileId())) { @@ -272,8 +270,15 @@ public class AdjstReqWebController { return ResponseEntity.ok().body(new RestResponse(HttpStatus.OK, exmp.getExmpCn(), LocalDateTime.now())); } - /** - * 조정신청 구분선택 - 안내화면 + /** + * @methodName : adjstReqOpenAnswerExamplePop + * @author : 이호영 + * @date : 2022.10.14 + * @description : 답변서 예문 + * @param adjstReqVO + * @param model + * @return + * @throws Exception */ @RequestMapping("/web/kccadr/adjst/popup/adjstReqOpenAnswerExamplePop.do") public String adjstReqOpenAnswerExamplePop(@ModelAttribute("adjstReqVO") AdjstReqVO adjstReqVO, ModelMap model) throws Exception { @@ -287,7 +292,7 @@ public class AdjstReqWebController { model.addAttribute("exmp", exmp); return "/web/kccadr/adjst/popup/adjstReqOpenAnswerExamplePop"; } - + /** * 조정신청 구분선택 - 안내화면 diff --git a/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpDetailController.java b/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpDetailController.java index b9955176..43b35a2c 100644 --- a/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpDetailController.java +++ b/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpDetailController.java @@ -179,7 +179,7 @@ public class AdjstExpDetailController { * 조정신청 구분선택 - 안내화면 */ @RequestMapping("/web/kccadr/adjstExpDetail/popup/openExpExamplePop.do") - public String adjstReqOpenAnswerExamplePop(@ModelAttribute("adjDeputyReqVO") AdjstDeputyReqVO adjDeputyReqVO, ModelMap model) throws Exception { + public String openExpExamplePop(@ModelAttribute("adjDeputyReqVO") AdjstDeputyReqVO adjDeputyReqVO, ModelMap model) throws Exception { String returnUrl = "/web/kccadr/adjstExpDetail/"; diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ans/ansSubmit.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ans/ansSubmit.jsp index e8bf1164..df49095f 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ans/ansSubmit.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ans/ansSubmit.jsp @@ -190,11 +190,11 @@

필수입력 항목*

답변내용

- + - + diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/popup/adjstReqOpenExamplePop.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/popup/adjstReqOpenExamplePop.jsp index 869e8d1f..99353c9e 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/popup/adjstReqOpenExamplePop.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/popup/adjstReqOpenExamplePop.jsp @@ -21,16 +21,14 @@ $(document).ready(function(){ // 레이어팝업 포커싱 이동 수정 var popupTit = $(".cont_tit03").text(); - $(".tooltip-close").click(function(){ - var activeTarget = $('[data-tooltip-con="fee_info_popup"]'); - activeTarget.hide(); - $('[data-tooltip="fee_info_popup"]').eq(0).focus(); - }); + $(".tooltip-close").click(function(){ + var activeTarget = $('[data-tooltip-con="fee_info_popup"]'); + activeTarget.hide(); + $('[data-tooltip="fee_info_popup"]').eq(0).focus(); + }); + + - /* - * init - * json으로 데이터 받아오기 - */ var data = new FormData(document.getElementById("selectForm")); $.ajax({ type:"POST", @@ -51,7 +49,9 @@ $(document).ready(function(){ } }); -s /* + + + /* * 저작물 변경 event */ $('#selectId').on('change', function(){ @@ -113,6 +113,7 @@ s /*
+
diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/kccadrConstantsJsp.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/kccadrConstantsJsp.jsp index 39b9b3e7..92e6a2a0 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/kccadrConstantsJsp.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/kccadrConstantsJsp.jsp @@ -1224,8 +1224,14 @@ var AdjstReq = { ); }, openExamplePop : function(exmpCd){ + /* + - 01 : 신청취지 + - 02 : 신청원인 + - 04 : 답변서 + - 05 : 사건진행도움말 + */ var uri = ''; - if(exmpCd == '01') + if(exmpCd == '01' || exmpCd == '04') { uri = "adjstReqOpenExamplePop.do"; } @@ -1254,16 +1260,16 @@ var AdjstReq = { , "openExpExamplePop" ); }, - openAnswerExamplePop : function(codeId){ - commonPopLayeropen( - "/web/kccadr/adjst/popup/adjstReqOpenAnswerExamplePop.do" - , 1100 - , 600 - , {codeId : codeId} - , "N" - , "openExamplePop" - ); - }, +// openAnswerExamplePop : function(exmpCd){ +// commonPopLayeropen( +// "/web/kccadr/adjst/popup/adjstReqOpenAnswerExamplePop.do" +// , 1100 +// , 600 +// , {exmpCd : exmpCd} +// , "N" +// , "openExamplePop" +// ); +// }, adjstReqDataChoice : function(adrSeq){ $("#copyAdrSeq").val(adrSeq); this.fncGoRefresh();