diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java b/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java index b8513fc4..13b36d81 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java @@ -21,5 +21,7 @@ public interface AdjReqMgrPastService { AdjReqMgrPastVO selectMemAss(AdjReqMgrPastVO adjReqMgrPastVO); + AdjReqMgrPastVO findByIdPrtclMgr(AdjReqMgrPastVO adjReqMgrPastVO); + } diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastDAO.java b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastDAO.java index 9868c469..dbb4839c 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastDAO.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastDAO.java @@ -65,5 +65,9 @@ public class AdjReqMgrPastDAO extends EgovAbstractDAO { update("adjReqMgrPastDAO.updateAdrPrtclMgr", adjPastVO ); } + public AdjReqMgrPastVO findByIdPrtclMgr(AdjReqMgrPastVO adjReqMgrPastVO) { + return (AdjReqMgrPastVO) select("adjReqMgrPastDAO.findByIdPrtclMgr", adjReqMgrPastVO); + } + } diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java index 82672e76..a4b023c7 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java @@ -563,11 +563,7 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements // 40 조정취하 // 50 다음기일 // 60 조정권고안 -// - if("50".equals(adjPastVO.getAppResultTy())) - { - - } + adjReqMgrPastDAO.updateAdrPrtclMgr(adjPastVO); } @@ -652,5 +648,11 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements } + + @Override + public AdjReqMgrPastVO findByIdPrtclMgr(AdjReqMgrPastVO adjReqMgrPastVO) { + return adjReqMgrPastDAO.findByIdPrtclMgr(adjReqMgrPastVO); + } + } diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java b/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java index d0b2d57b..57880189 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java @@ -217,7 +217,7 @@ public class AdjReqMgrPastController { * @issue 기존에 기일조서등록 sql이 너무 길어 기존 로직 그대로 구현 */ @RequestMapping("/kccadr/adjReqMgOff/popup/drtRegPop.do") - public String adjReqMgrPastProgPop(PgrCmmVO cmmVO, DrtVO drtVO, ModelMap model) throws Exception { + public String drtRegPop(PgrCmmVO cmmVO, DrtVO drtVO, ModelMap model) throws Exception { List assList = drtService.selectAssRegList(drtVO); @@ -250,13 +250,51 @@ public class AdjReqMgrPastController { return "/kccadr/adjReqMgrPast/drtRegPop"; } - - - - - - + /** + * @methodName : drtUpdtPop + * @author : 이호영 + * @date : 2022.09.22 + * @description : + * @param cmmVO + * @param drtVO + * @param model + * @return + * @throws Exception + */ + @RequestMapping("/kccadr/adjReqMgOff/popup/drtUpdtPop.do") + public String drtUpdtPop(AdjReqMgrPastVO adjReqMgrPastVO, ModelMap model) throws Exception { + + AdjReqMgrPastVO adjPastVO = adjReqMgrPastService.findByIdPrtclMgr(adjReqMgrPastVO); + + + +// DrtVO drtVO = new DrtVO(); +// drtVO.setAdrSeq(adjReqMgrPastVO.); +// drtVO.setAdrSn(adrSeq); + +// model.addAttribute("assList", drtService.selectAssRegList(drtVO)); + + //사건 정보 불러오기 +// PgrCmmVO info = cmmService.selectPgrCmm(cmmVO); + + /* 조정부 / 조정조사관 select */ +// AdjReqMgrPastVO adjReqVO = new AdjReqMgrPastVO(); +// adjReqVO.setAdrSeq(cmmVO.getAdrSeq()); +// model.addAttribute("memAss", adjReqMgrPastService.selectMemAss(adjReqVO)); + + + // 등록된 값이 있으면 select +// if(StringUtils.isNotEmpty(cmmVO.getPrtclCn())) +// { + +// } +// model.addAttribute("newAdrSn", cmmVO.getNowAdrSn()); + + + return "/kccadr/adjReqMgrPast/drtRegPop"; + + } diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml index 5c0a39e4..d49b70ef 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml @@ -39,6 +39,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + SELECT + ADR_SEQ + , ADR_SN + , PRTCL_SEQ + , OPEN_YN + , APP_DE + , APP_PLACE_TY + , APP_PLACE + , NEXT_APP_DE_YN + , NEXT_APP_DE + , PRTCL_CN + , SBMT_YN + , SBMT_DE + , APPR_YN + , APPR_DE + , FRST_REGIST_PNTTM + , FRST_REGISTER_ID + , LAST_UPDT_PNTTM + , LAST_UPDUSR_ID + , APP_RESULT_TY + FROM ADR_PRTCL_MGR + WHERE PRTCL_SEQ = #prtclSeq# + + - + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastProgRegist.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastProgRegist.jsp index 745f8262..873ce1c9 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastProgRegist.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastProgRegist.jsp @@ -80,14 +80,18 @@ $(document).ready(function(){ // click한 row의 차수 var nowAdrSn = $.trim($(this).parents().parents().children("td:first").text()); - $('#nowAdrSn').val(nowAdrSn); + $('#prtclSeq').val($(this).data('info')); commonPopWindowopenForm("/kccadr/adjReqMgOff/popup/drtRegPop.do", '820', '600', "adjReqMgrPastProgPop", $('#popPageForm')); }); $('.updBtn').on('click', function(){ + + $('#prtclSeq').val($(this).data('info')); + + commonPopWindowopenForm("/kccadr/adjReqMgOff/popup/drtUpdtPop.do", '820', '600', "adjReqMgrPastProgPop", $('#popPageForm')); }); });