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 23719608..383eb683 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java @@ -646,9 +646,18 @@ public class ApmController { @RequestMapping(value = "popup/adjstReqOpenExamplePop.do") public String adjstReqOpenExamplePop(@ModelAttribute("adjstReqVO") AdjstReqVO adjstReqVO, ModelMap model) throws Exception { - model.addAttribute("ccTy", adjstReqVO.getCcTy()); - model.addAttribute("exmpCd", adjstReqVO.getExmpCd()); + List exmp = adjstReqService.selectAdjstReqOpenExamplePop(adjstReqVO); +// if (exmp != null && StringUtils.isNotBlank(exmp.getAtchFileId())) { +// FileVO fileVO = new FileVO(); +// fileVO.setAtchFileId(exmp.getAtchFileId()); +// List fileList = fileService.selectFileInfs(fileVO); +// model.addAttribute("fileList", fileList); +// } + model.addAttribute("exmp", exmp); + model.addAttribute("ccTy", adjstReqVO.getCcTy()); + model.addAttribute("exmpCd", adjstReqVO.getExmpCd()); + return "/kccadr/adjPgrMgr/apm/popup/adjstReqOpenExamplePop"; } @@ -664,7 +673,7 @@ public class ApmController { @RequestMapping(value = "popup/adjstReqOpenExamplePop2.do") public String adjstReqOpenExamplePop2(@ModelAttribute("adjstReqVO") AdjstReqVO adjstReqVO, ModelMap model) throws Exception { - AdjstReqVO exmp = adjstReqService.selectAdjstReqOpenExamplePop(adjstReqVO); + AdjstReqVO exmp = adjstReqService.selectAdjstReqOpenExamplePop(adjstReqVO).get(0); if (exmp != null && StringUtils.isNotBlank(exmp.getAtchFileId())) { FileVO fileVO = new FileVO(); diff --git a/src/main/java/kcc/kccadr/adjst/service/AdjstReqService.java b/src/main/java/kcc/kccadr/adjst/service/AdjstReqService.java index 9de57583..4e0d8b79 100644 --- a/src/main/java/kcc/kccadr/adjst/service/AdjstReqService.java +++ b/src/main/java/kcc/kccadr/adjst/service/AdjstReqService.java @@ -53,7 +53,7 @@ public interface AdjstReqService { public AdjstReqVO selectAdjstReqOpenExamplePopCn(AdjstReqVO adjstReqVO) throws Exception; - public AdjstReqVO selectAdjstReqOpenExamplePop(AdjstReqVO adjstReqVO) throws Exception; + public List selectAdjstReqOpenExamplePop(AdjstReqVO adjstReqVO) throws Exception; // 조정사건 대리인/신청인/피신청인 정보 불러오기 public List selectAdjsReqUserListByadjSeq(AdjstReqVO adjstReqVO) throws Exception; diff --git a/src/main/java/kcc/kccadr/adjst/service/AdjstReqVO.java b/src/main/java/kcc/kccadr/adjst/service/AdjstReqVO.java index 43d31309..cac1a6be 100644 --- a/src/main/java/kcc/kccadr/adjst/service/AdjstReqVO.java +++ b/src/main/java/kcc/kccadr/adjst/service/AdjstReqVO.java @@ -165,6 +165,7 @@ public class AdjstReqVO extends ComDefaultVO implements Serializable { private String reqDetail; private String rejtReson; private String edtStatus; + private String exmpMgrId; private String exmpCd; private String exmpCn; private String exmpTit; @@ -881,6 +882,12 @@ public class AdjstReqVO extends ComDefaultVO implements Serializable { public void setLoginNextUrl(String loginNextUrl) { this.loginNextUrl = loginNextUrl; } + public String getExmpMgrId() { + return exmpMgrId; + } + public void setExmpMgrId(String exmpMgrId) { + this.exmpMgrId = exmpMgrId; + } } diff --git a/src/main/java/kcc/kccadr/adjst/service/impl/AdjstReqDAO.java b/src/main/java/kcc/kccadr/adjst/service/impl/AdjstReqDAO.java index 2b1764d3..5d876102 100644 --- a/src/main/java/kcc/kccadr/adjst/service/impl/AdjstReqDAO.java +++ b/src/main/java/kcc/kccadr/adjst/service/impl/AdjstReqDAO.java @@ -176,8 +176,8 @@ public class AdjstReqDAO extends EgovAbstractDAO { return (AdjstReqVO) select("AdjstReqDAO.selectAdjstReqOpenAnswerExamplePop",adjstReqVO); } - public AdjstReqVO selectAdjstReqOpenExamplePop(AdjstReqVO adjstReqVO) throws Exception { - return (AdjstReqVO) select("AdjstReqDAO.selectAdjstReqOpenExamplePop",adjstReqVO); + public List selectAdjstReqOpenExamplePop(AdjstReqVO adjstReqVO) throws Exception { + return (List) list("AdjstReqDAO.selectAdjstReqOpenExamplePop",adjstReqVO); } public int selectRespondentSchChk(AdjstReqVO adjstReqVO) { diff --git a/src/main/java/kcc/kccadr/adjst/service/impl/AdjstReqServiceImpl.java b/src/main/java/kcc/kccadr/adjst/service/impl/AdjstReqServiceImpl.java index 5b3b3db1..cb77f259 100644 --- a/src/main/java/kcc/kccadr/adjst/service/impl/AdjstReqServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjst/service/impl/AdjstReqServiceImpl.java @@ -1177,7 +1177,7 @@ public class AdjstReqServiceImpl extends EgovAbstractServiceImpl implements Adj } @Override - public AdjstReqVO selectAdjstReqOpenExamplePop(AdjstReqVO adjstReqVO) throws Exception { + public List selectAdjstReqOpenExamplePop(AdjstReqVO adjstReqVO) throws Exception { return adjstReqDAO.selectAdjstReqOpenExamplePop(adjstReqVO); } } diff --git a/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java b/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java index 4254cea4..260ed2b2 100644 --- a/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java +++ b/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java @@ -50,6 +50,7 @@ import kcc.com.utl.fcc.service.EgovStringUtil; import kcc.com.utl.user.service.CheckAdrProcessUtil; import kcc.kccadr.accdnt.crtfc.service.CrtfcService; import kcc.kccadr.adjPgrMgr.exmp.cmm.ExmpManageVO; +import kcc.kccadr.adjReqMgrPast.service.AdjReqMgrPastVO; import kcc.kccadr.adjst.service.AdjstReqService; import kcc.kccadr.adjst.service.AdjstReqVO; import kcc.kccadr.cmm.KccadrConstants; @@ -203,10 +204,34 @@ public class AdjstReqWebController { */ @RequestMapping("/web/kccadr/adjst/popup/adjstReqOpenExamplePop.do") public String adjstReqOpenExamplePop(@ModelAttribute("adjstReqVO") AdjstReqVO adjstReqVO, ModelMap model) throws Exception { - model.addAttribute("ccTy", adjstReqVO.getCcTy()); - model.addAttribute("exmpCd", adjstReqVO.getExmpCd()); + + List exmpList = adjstReqService.selectAdjstReqOpenExamplePop(adjstReqVO); + +// if (exmpList != null && StringUtils.isNotBlank(exmpList.getAtchFileId())) { +// FileVO fileVO = new FileVO(); +// fileVO.setAtchFileId(exmpList.getAtchFileId()); +// List fileList = fileService.selectFileInfs(fileVO); +// model.addAttribute("fileList", fileList); +// } + model.addAttribute("exmpList", exmpList); + return "/web/kccadr/adjst/popup/adjstReqOpenExamplePop"; } + + @RequestMapping(value = {"/web/kccadr/adjst/popup/adjstReqOpenExampleAjax.do"}) + public ResponseEntity saveAdjReqRecordAjax(AdjstReqVO adjstReqVO, HttpServletRequest request) throws Exception { + + List exmpList = adjstReqService.selectAdjstReqOpenExamplePop(adjstReqVO); + +// if (exmpList != null && StringUtils.isNotBlank(exmpList.getAtchFileId())) { +// FileVO fileVO = new FileVO(); +// fileVO.setAtchFileId(exmpList.getAtchFileId()); +// List fileList = fileService.selectFileInfs(fileVO); +// model.addAttribute("fileList", fileList); +// } + + return ResponseEntity.ok(new RestResponse(HttpStatus.OK, exmpList, "", LocalDateTime.now())); + } /** @@ -220,7 +245,7 @@ public class AdjstReqWebController { @RequestMapping(value = "/web/kccadr/adjst/popup/adjstReqOpenExamplePop2.do") public String adjstReqOpenExamplePop2(@ModelAttribute("adjstReqVO") AdjstReqVO adjstReqVO, ModelMap model) throws Exception { - AdjstReqVO exmp = adjstReqService.selectAdjstReqOpenExamplePop(adjstReqVO); + AdjstReqVO exmp = adjstReqService.selectAdjstReqOpenExamplePop(adjstReqVO).get(0); if (exmp != null && StringUtils.isNotBlank(exmp.getAtchFileId())) { FileVO fileVO = new FileVO(); @@ -228,15 +253,12 @@ public class AdjstReqWebController { List fileList = fileService.selectFileInfs(fileVO); model.addAttribute("fileList", fileList); } - System.out.println("exmp :: "+ exmp); model.addAttribute("exmp", exmp); return "/web/kccadr/adjst/popup/adjstReqOpenExamplePop2"; } @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())) { @@ -248,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 { @@ -263,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/java/kcc/web/MainController.java b/src/main/java/kcc/web/MainController.java index 3023cd59..1fa17550 100644 --- a/src/main/java/kcc/web/MainController.java +++ b/src/main/java/kcc/web/MainController.java @@ -1278,7 +1278,7 @@ public class MainController { if(menuUrl.equals("/web/cop/org/selectOrgDetail.do")){ menuUrl = "/web/cop/org/selectOrgList.do" ; }else if(menuUrl.equals("/web/kccadr/accdnt/ars/adjstReqStatusDetail.do") - || menuUrl.equals("/web/kccadr/adjstExpDetail/adjstReqStatusDetail.do") +// || menuUrl.equals("/web/kccadr/adjstExpDetail/adjstReqStatusDetail.do") || menuUrl.equals("/web/kccadr/accdnt/acd/adjstChangeDateList.do") || menuUrl.equals("/web/kccadr/accdnt/acd/adjstChangeDateCreate.do") || menuUrl.equals("/web/kccadr/accdnt/arc/corReqList.do") @@ -1320,7 +1320,21 @@ public class MainController { }else if(menuUrl.equals("/web/kccadr/accdnt/ai/adjstIncidentDashList.do")) { //나의사건관리 대시보드 menuUrl = "/web/kccadr/accdnt/ai/adjstIncidentList.do"; - } + }else if(menuUrl.equals("/web/kccadr/adjstExpDetail/adjstReqStatusDetail.do") // 체험하기 + ||menuUrl.equals("/web/kccadr/adjstExp/adjstIncidentList.do") + ||menuUrl.equals("/web/kccadr/adjstExpDetail/adjstIncidentDetail.do") + ||menuUrl.equals("/web/kccadr/adjstExp/adjstReqRegistInformation.do") + ||menuUrl.equals("/web/kccadr/adjstExp/adjstReqRegistStep1.do") + ||menuUrl.equals("/web/kccadr/adjstExp/adjstReqRegistStep2.do") + ||menuUrl.equals("/web/kccadr/adjstExp/adjstReqRegistStep3.do") + ||menuUrl.equals("/web/kccadr/adjstExp/SsoLoginUsr.do") + ||menuUrl.equals("") + ||menuUrl.equals("") + ||menuUrl.equals("") + ||menuUrl.equals("") + ) { //체험하기 + menuUrl = "/web/kccadr/adjstExp/adjstExpMainPage.do"; + } @@ -1343,7 +1357,7 @@ public class MainController { } }else { //조직도 상세 String menuUrl = request.getRequestURI() ; - if(menuUrl.equals("/web/cop/org/selectOrgDetail.do")){ + if(menuUrl.equals("/web/cop/org/selectOrgDetail.do")){ menuUrl = "/web/cop/org/selectOrgList.do" ; ComDefaultVO searchVO = new ComDefaultVO(); searchVO.setSearchKeyword(menuUrl); diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjst/AdjstReq_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjst/AdjstReq_SQL_Mysql.xml index 7005ac1f..e9114f71 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/adjst/AdjstReq_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/adjst/AdjstReq_SQL_Mysql.xml @@ -894,18 +894,19 @@ diff --git a/src/main/webapp/WEB-INF/jsp/web/com/webCommonNaviWrap.jsp b/src/main/webapp/WEB-INF/jsp/web/com/webCommonNaviWrap.jsp index b3518bf6..25bc38ae 100644 --- a/src/main/webapp/WEB-INF/jsp/web/com/webCommonNaviWrap.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/com/webCommonNaviWrap.jsp @@ -184,7 +184,8 @@ function snsShare(snsName) { - + 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/adjcclt/adjstDrtDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/adjstDrtDetail.jsp index 2b343f93..5692c3f4 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/adjstDrtDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/adjstDrtDetail.jsp @@ -148,8 +148,6 @@ - -

조정부

@@ -297,6 +295,35 @@ +
+ + + + + + + + + + + + + + +<%-- --%> + +<%-- --%> + + + + + + +
일자내용조정위원
등록된 의견이 없습니다.
의견 + +
+
+ <%--의견등록--%>
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 e93c6343..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 @@ -16,28 +16,47 @@
-
-

조정신청 예문

+

신청취지 예문

- * + *
@@ -102,14 +92,13 @@ $(document).ready(function(){ @@ -118,7 +107,7 @@ $(document).ready(function(){ 내용 @@ -129,5 +118,8 @@ $(document).ready(function(){ + + " /> + 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(); diff --git a/src/main/webapp/js/page/adjstReq/adjstReq.js b/src/main/webapp/js/page/adjstReq/adjstReq.js index a3feb2ca..d26d6132 100644 --- a/src/main/webapp/js/page/adjstReq/adjstReq.js +++ b/src/main/webapp/js/page/adjstReq/adjstReq.js @@ -1025,6 +1025,7 @@ var AdjstReq = { ); }, openExamplePop : function(expmCd){ + console.log(" + expmCd :: ", expmCd); commonPopLayeropen( "/web/kccadr/adjst/popup/adjstReqOpenExamplePop.do" , 1100
- + -<%-- --%> - + + +
- 1)피신청인은 신청인에게 저작권 침해에 따른 손해배상 및 위자료로서 금삼백만원(W3,000,000)을 지급한다. 2)피신청인이 제작, 보유하고 있는 본 건 침해물 <월간 스키라이브>를 조정성립일로부터 14일 이내에 폐기처분한다. 라는 조정을 구합니다 +