From 6721e2a3a9744ad87fc3e2b4cb66ecb319f51f21 Mon Sep 17 00:00:00 2001 From: hylee Date: Mon, 14 Nov 2022 14:06:41 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=EA=B5=AC=EC=B6=95=EC=BD=94=EB=93=9C+?= =?UTF-8?q?=EC=9C=A0=EC=A7=80=EB=B3=B4=EC=8A=A4=EC=99=80=20=EA=B3=A0?= =?UTF-8?q?=EB=8F=84=ED=99=94=20=EC=BD=94=EB=93=9C=20=EB=A8=B8=EC=A7=80=20?= =?UTF-8?q?=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adjPgrMgr/apm/web/ApmController.java | 166 +++++++++++++++++- .../adjPgrMgr/cmm/service/PgrCmmService.java | 11 ++ .../adjPgrMgr/cmm/service/impl/PgrCmmDAO.java | 10 ++ .../cmm/service/impl/PgrCmmServiceImpl.java | 85 ++++++++- .../service/impl/DlvinfoServiceImpl.java | 14 +- .../dlvinfo/web/DlvinfoController.java | 6 +- .../adjPgrMgr/drt/service/DrtService.java | 7 +- .../adjPgrMgr/drt/service/impl/DrtDAO.java | 7 + .../drt/service/impl/DrtServiceImpl.java | 10 +- .../adjPgrMgr/drt/web/DrtController.java | 31 ++++ .../service/impl/InternalApprovManageDAO.java | 7 + .../web/AdjstConciliatorController.java | 9 +- .../adjreqmgr/web/AdjReqMgrController.java | 20 ++- .../java/kcc/kccadr/cmm/KccadrConstants.java | 13 +- .../accdnt/ars/AdjustReqStatus_SQL_Mysql.xml | 2 +- .../kccadr/adjPgrMgr/cmm/Cmm_SQL_Mysql.xml | 18 ++ .../adjPgrMgr/dlvinfo/Dlvinfo_SQL_Mysql.xml | 2 +- .../kccadr/adjPgrMgr/drt/Drt_SQL_Mysql.xml | 11 +- .../adjPgrMgr/iam/IamManage_SQL_Mysql.xml | 10 +- .../jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp | 155 +++++++++++++++- .../kccadr/adjPgrMgr/apm/popup/addRpplPop.jsp | 6 +- .../apm/popup/adrRpplResPonDentPop.jsp | 26 +-- .../kccadr/adjPgrMgr/apm/popup/docRegPop.jsp | 9 + .../jsp/kccadr/adjPgrMgr/dnt/dntDetail.jsp | 3 +- .../jsp/kccadr/adjPgrMgr/drt/drtDetail.jsp | 40 ++++- .../kccadr/adjPgrMgr/drt/popup/addAgntPop.jsp | 6 +- .../iam/internalApprovManageEndDetail.jsp | 3 + .../jsp/kccadr/adjReqMgr/adjReqMgrRegEdit.jsp | 36 ++-- .../jsp/kccadr/adjReqMgr/adjReqMgrRegist.jsp | 36 ++-- .../adjReqMgrOff/adjReqMgrOffRegist.jsp | 35 ++-- .../adjReqMgrOff/adjReqMgrOffUpdtView.jsp | 36 ++-- .../kccadr/adjclsmgr/adjCloseMangeList.jsp | 15 ++ .../web/kccadr/accdnt/arc/corReqCreate.jsp | 5 +- .../web/kccadr/accdnt/arc/corReqDetail.jsp | 5 +- .../jsp/web/kccadr/accdnt/chg/addAgent.jsp | 6 +- .../adjst/addAdjstReq3RegistFormAjax.jsp | 6 +- .../jsp/web/kccadr/adjst/adjstReq2Regist.jsp | 7 +- .../jsp/web/kccadr/adjst/adjstReq3Regist.jsp | 26 +-- .../kccadr/adjstExp/adjstReqRegistStep3.jsp | 2 +- src/main/webapp/js/kccadr/kccadrConstants.js | 7 + 40 files changed, 801 insertions(+), 108 deletions(-) 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 6074a3c1..205b5c55 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java @@ -1632,6 +1632,13 @@ public class ApmController { @RequestMapping(value = "popup/docRegPop.do") public String docRegPop(@ModelAttribute("AnsVO") AnsVO ansVO, ModelMap model) throws Exception { + /* + * 2022.11.14. + * 기존 유지보수 코드 update + * */ + LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated() ? (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser() : null; + String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getUniqId()); + AdjstReqStatusVO adjstReqStatusVO = new AdjstReqStatusVO(); adjstReqStatusVO.setAdrSeq(ansVO.getAdrSeq()); @@ -1649,6 +1656,12 @@ public class ApmController { adrAdminInfoVO = adjstReqStatusService.selectAdjstReqAdrAdmInfo(adjstReqStatusVO); model.addAttribute("adrAdminInfo", adrAdminInfoVO); + + /* + * 2022.11.14. + * 기존 유지보수 코드 update + * */ + model.addAttribute("userId", userId); return "/kccadr/adjPgrMgr/apm/popup/docRegPop"; } @@ -2372,7 +2385,158 @@ public class ApmController { info.setAppliCantNm(egovCryptoUtil.decrypt(info.getAppliCantNm())); } } - + + + /* + * 2022.11.14. + * 기존 유지보수 코드 update + * */ + /** + * 배당전취하종결 버튼 클릭 시 사건문서-취하신청서 등록 여부 체크 + * + * @param CloseVO + * @param model + * @return + * @throws Exception + */ + @RequestMapping(value = "entBeforeDtbCheckAjax.do") + public ModelAndView entBeforeDtbCheckAjax(@ModelAttribute("entBeforeDtb") CloseVO closeVO, ModelMap model, HttpServletRequest request) throws Exception { + + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + + LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated() ? (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser() : null; + String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getUniqId()); + + if (loginVO == null) { + + modelAndView.addObject("result", "loginFail"); + return modelAndView; + } + + try { + int entCloseDocCnt = cmmService.selectCloseDocEnt(closeVO); + + if(entCloseDocCnt > 0) { + modelAndView.addObject("entCloseDocCnt", entCloseDocCnt); + }else { + modelAndView.addObject("entCloseDocCnt", 0); + } + modelAndView.addObject("result", "SUCCESS"); + } catch (Exception e) { + modelAndView.addObject("result", "FAIL"); + } + + return modelAndView; + } + + /* + * 2022.11.14. + * 기존 유지보수 코드 update + * */ + /** + * 배당전취하종결 버튼 클릭 시 조정조사관 팝업 > 등록 버튼 Ajax + * + * @param + * @param model + * @return + * @throws Exception + */ + @RequestMapping(value = "entBeforeDtbAdrAdminRegAjax.do") + public ModelAndView entBeforeDtbAdrAdminRegAjax(@ModelAttribute("pgrCmmVO") PgrCmmVO cmmVO, ModelMap model, HttpServletRequest request) throws Exception { + + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + + LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated() ? (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser() : null; + String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getUniqId()); + + if (loginVO == null) { + + modelAndView.addObject("result", "loginFail"); + return modelAndView; + } + + try { + cmmService.updateEntBeforeDtbAdrAdminReg(cmmVO); + + modelAndView.addObject("result", "SUCCESS"); + } catch (Exception e) { + modelAndView.addObject("result", "FAIL"); + } + + return modelAndView; + } + + /* + * 2022.11.14. + * 기존 유지보수 코드 update + * */ + /** + * 배당전취하종결 버튼 클릭 시 처리 + * + * @param CloseVO + * @param model + * @return + * @throws Exception + */ + @RequestMapping(value = "entBeforeDtbAjax.do") + public ModelAndView entBeforeDtbAjax(@ModelAttribute("entBeforeDtb") CloseVO closeVO, ModelMap model, HttpServletRequest request) throws Exception { + + /* + * 입금완료, 조정접수, 접수결재요청, 접수결재완료, 조정부지정 일 경우 처리 + * 결재 요청(접수결재요청, 배당결재요청 상태)에서 버튼 클릭 시 요청된 결재는 삭제 + * + * */ + + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + + LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated() ? (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser() : null; + String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getUniqId()); + + if (loginVO == null) { + + modelAndView.addObject("result", "loginFail"); + return modelAndView; + } + + System.out.println("adrSeq :: " + closeVO.getAdrSeq()); + System.out.println("adrSn :: " + closeVO.getAdrSn()); + System.out.println("statCd :: " + closeVO.getStatCd()); + + /* step 1. statCd 30000X 로 update + * 상태별 update + * ADR_PAY_COMP = "104050"; // 입금완료 + => 입금완료-배당전취하종결 (300001) + ADR_RCPT_COMP = "101050"; // 조정접수 + => 조정접수-배당전취하종결 (300002) + ADR_RCPT_APPR_REQ = "201010"; // 접수결재요청 + => 접수결재요청-배당전취하종결 (300003) + ADR_RCPT_APPR_COMP = "201050"; // 접수결재완료 + => 접수결재완료-배당전취하종결 (300004) + ADR_RCPT_DTB_REQ = "202010"; // 배당결재요청 + => 배당결재요청-배당전취하종결 (300005) + * step 2. statCd 400000 로 update + * step 3. + * 접수결재 요청(ADR_RCPT_APPR_REQ, 201010), 배당결재요청(ADR_RCPT_DTB_REQ, 202010) + * 일 경우 결재 요청 delete 처리 + * + */ + + try { + int resultCnt = cmmService.updateEntBeforeDtb(closeVO, userId); + + System.out.println("resultCnt ::" + resultCnt); + + modelAndView.addObject("result", "SUCCESS"); + } catch (Exception e) { + modelAndView.addObject("result", "FAIL"); + } + + return modelAndView; + } + //////////////////////////////////////////////////////////////////////////////////////// // // private function diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/PgrCmmService.java b/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/PgrCmmService.java index 8a5a4089..2de7d3a1 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/PgrCmmService.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/PgrCmmService.java @@ -57,5 +57,16 @@ public interface PgrCmmService { , String p_stat_cd , String p_adrHstryMgrSeq ) throws Exception; + + + //배당전취하종결 - 종결문서 중 취하신청문서가 cnt + int selectCloseDocEnt(CloseVO closeVO) throws Exception; + + //배당전 취하종결 처리 서비스 + int updateEntBeforeDtb(CloseVO closeVO, String userId) throws Exception; + + //배당전 취하종결 조정조사관 등록 + int updateEntBeforeDtbAdrAdminReg(PgrCmmVO pgrCmmVO) throws Exception; + } diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/impl/PgrCmmDAO.java b/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/impl/PgrCmmDAO.java index 3b2fba2b..8c933522 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/impl/PgrCmmDAO.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/impl/PgrCmmDAO.java @@ -92,4 +92,14 @@ public class PgrCmmDAO extends EgovAbstractDAO { public String selectLastAdrSn(PgrCmmVO pgrCmmVO) throws Exception { return (String) select("Cmm.selectLastAdrSn", pgrCmmVO); } + + + public int selectCloseDocEnt(CloseVO closeVO) throws Exception { + return (int) select("Cmm.selectCloseDocEnt", closeVO); + } + + public int updateEntBeforeDtbAdrAdminReg(PgrCmmVO pgrCmmVO) throws Exception { + return (Integer) update("Cmm.updateEntBeforeDtbAdrAdminReg",pgrCmmVO); + } + } diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/impl/PgrCmmServiceImpl.java b/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/impl/PgrCmmServiceImpl.java index 74207e5c..5a6a0769 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/impl/PgrCmmServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/impl/PgrCmmServiceImpl.java @@ -17,6 +17,11 @@ import kcc.kccadr.adjPgrMgr.cmm.service.PgrCmmService; import kcc.kccadr.adjPgrMgr.cmm.service.PgrCmmVO; import kcc.kccadr.advc.service.impl.AdrHstryMgrDAO; import kcc.let.utl.fcc.service.EgovCryptoUtil; +import kcc.kccadr.adjPgrMgr.iam.service.InternalApprovManageVO; +import kcc.kccadr.adjPgrMgr.iam.service.impl.InternalApprovManageDAO; +import kcc.kccadr.adjreqmgr.service.AdjReqMgrVO; +import kcc.kccadr.cmm.KccadrConstants; +import kcc.kccadr.kccadrCom.service.KccadrMgrUdtService; @Repository("pgrCmmService") public class PgrCmmServiceImpl implements PgrCmmService { @@ -31,6 +36,12 @@ public class PgrCmmServiceImpl implements PgrCmmService { @Resource(name = "egovCldMgrManageGnrService") private EgovIdGnrService idgenService; + + @Resource(name="KccadrMgrUdtService") + private KccadrMgrUdtService kccadrMgrUdtService; + + @Resource(name="internalApprovManageDAO") + private InternalApprovManageDAO internalApprovManageDAO; // 조정사건이력관리 DAO @Resource(name = "adrHstryMgrDAO") @@ -346,6 +357,78 @@ public class PgrCmmServiceImpl implements PgrCmmService { return s_ret; } - + @Override + public int selectCloseDocEnt(CloseVO closeVO) throws Exception { + return pgrCmmDAO.selectCloseDocEnt(closeVO); + } + + @Override + public int updateEntBeforeDtb(CloseVO closeVO, String userId) throws Exception { + /* step 1. statCd 30000X 로 update + * 상태별 update + * ADR_PAY_COMP = "104050"; // 입금완료 + => 입금완료-배당전취하종결 (300001) + ADR_RCPT_COMP = "101050"; // 조정접수 + => 조정접수-배당전취하종결 (300002) + ADR_RCPT_APPR_REQ = "201010"; // 접수결재요청 + => 접수결재요청-배당전취하종결 (300003) + ADR_RCPT_APPR_COMP = "201050"; // 접수결재완료 + => 접수결재완료-배당전취하종결 (300004) + ADR_RCPT_DTB_REQ = "202010"; // 배당결재요청 + => 배당결재요청-배당전취하종결 (300005) + * step 2. statCd 400000 로 update + * step 3. 접수결재 요청(ADR_RCPT_APPR_REQ, 201010), 배당결재요청(ADR_RCPT_DTB_REQ, 202010) 일 경우 결재 요청 delete 처리 + */ + String statCd = KccadrConstants.ADR_DEPTBFRCNCL_RCPT_APPR_REQ; + switch(closeVO.getStatCd()) { + case KccadrConstants.ADR_PAY_COMP : // 104050, 입금완료 + statCd = KccadrConstants.ADR_DEPTBFRCNCL_PAY_COMP; + break; + case KccadrConstants.ADR_RCPT_COMP : // 101050, 조정접수 + statCd = KccadrConstants.ADR_DEPTBFRCNCL_ADR_RCPT_COMP; + break; + case KccadrConstants.ADR_RCPT_APPR_REQ : // 201010, 접수결재요청 + statCd = KccadrConstants.ADR_DEPTBFRCNCL_RCPT_APPR_REQ; + break; + case KccadrConstants.ADR_RCPT_APPR_COMP : // 201050, 접수결재완료 + statCd = KccadrConstants.ADR_DEPTBFRCNCL_RCPT_APPR_COMP; + break; + case KccadrConstants.ADR_RCPT_DTB_REQ : // 202010, 배당결재요청 + statCd = KccadrConstants.ADR_DEPTBFRCNCL_ADR_RCPT_DTB_REQ; + break; + } + + AdjReqMgrVO adjReqMgrVO = new AdjReqMgrVO(); + adjReqMgrVO.setAdrSeq(closeVO.getAdrSeq()); // 조정일련번호 + adjReqMgrVO.setStatCd(statCd); // 최종 변경 상태값 + adjReqMgrVO.setLastUpdusrId(userId); // 최종 변경자 + + //step1.statCd 30000X 로 update + int resultCnt = kccadrMgrUdtService.updateAdrMgrUdt(adjReqMgrVO, ""); + + //step2.statCd 400000 로 update + statCd = KccadrConstants.ADR_CLOSE; + adjReqMgrVO.setStatCd(statCd); // 최종 변경 상태값 + resultCnt += kccadrMgrUdtService.updateAdrMgrUdt(adjReqMgrVO, ""); + + //step3.접수결재 요청(ADR_RCPT_APPR_REQ, 201010), 배당결재요청(ADR_RCPT_DTB_REQ, 202010) 일 경우 결재 요청 delete 처리 + if(closeVO.getStatCd().equals(KccadrConstants.ADR_RCPT_APPR_REQ) + || closeVO.getStatCd().equals(KccadrConstants.ADR_RCPT_DTB_REQ)) { + + InternalApprovManageVO internalApprovManageVO = new InternalApprovManageVO(); + internalApprovManageVO.setAdrSeq(closeVO.getAdrSeq()); + internalApprovManageVO.setSbmtTy(closeVO.getStatCd()); + + internalApprovManageDAO.deleteSbmtMgr(internalApprovManageVO); + } + + return resultCnt; + } + + @Override + public int updateEntBeforeDtbAdrAdminReg(PgrCmmVO pgrCmmVO) throws Exception { + return (Integer) pgrCmmDAO.updateEntBeforeDtbAdrAdminReg(pgrCmmVO); + } + } diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/dlvinfo/service/impl/DlvinfoServiceImpl.java b/src/main/java/kcc/kccadr/adjPgrMgr/dlvinfo/service/impl/DlvinfoServiceImpl.java index b9e591f7..58506ca0 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/dlvinfo/service/impl/DlvinfoServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/dlvinfo/service/impl/DlvinfoServiceImpl.java @@ -191,10 +191,20 @@ public class DlvinfoServiceImpl implements DlvinfoService { } if (!StringUtil.isEmpty(result.getAppliCantDNm())) { - String[] appliCantDNmArr = result.getAppliCantDNm().split(", "); + /* + * 2022.11.14. + * 기존 유지보수 코드 update + * */ + String[] appliCantDNmArr = result.getAppliCantDNm().split("§ "); + String appliCantDNm = ""; for (String applDNm : appliCantDNmArr) { - appliCantDNm += ", " + egovCryptoUtil.decrypt(applDNm)+"[신청인 대리인]!"+KccadrConstants.ADR_RPPL_TY_REQ_DEPUTY; //신청인대리인 + /* + * 2022.11.14. + * 기존 유지보수 코드 update + * */ + appliCantDNm += "§ " + egovCryptoUtil.decrypt(applDNm)+"[신청인 대리인]!"+KccadrConstants.ADR_RPPL_TY_REQ_DEPUTY; //신청인대리인 + } result.setAppliCantDNm(appliCantDNm.substring(2)); } 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 ed9b25ff..27450822 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/dlvinfo/web/DlvinfoController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/dlvinfo/web/DlvinfoController.java @@ -319,7 +319,11 @@ public class DlvinfoController { String[] appliCantDNmList = new String[5]; if((info.getAppliCantDNm() != null) && (!"".equals(info.getAppliCantDNm()))) { - appliCantDNmList = info.getAppliCantDNm().split(","); + /* + * 2022.11.14. + * 기존 유지보수 코드 update + * */ + appliCantDNmList = info.getAppliCantDNm().split("§ "); //신청대리인 add for(int i = 0 ; i < appliCantDNmList.length; i++) { diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/drt/service/DrtService.java b/src/main/java/kcc/kccadr/adjPgrMgr/drt/service/DrtService.java index 11528287..29b5976a 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/drt/service/DrtService.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/drt/service/DrtService.java @@ -36,6 +36,11 @@ public interface DrtService { ) throws Exception; List selectAdrPrtclMgrEndDetail(DrtVO drtVO) throws Exception; - + + /* + * 2022.11.14. + * 기존 유지보수 코드 update + * */ + int updateAppResultTyChg(DrtVO drtVO) throws Exception; } diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/drt/service/impl/DrtDAO.java b/src/main/java/kcc/kccadr/adjPgrMgr/drt/service/impl/DrtDAO.java index fd4a8207..0b771ea7 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/drt/service/impl/DrtDAO.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/drt/service/impl/DrtDAO.java @@ -78,4 +78,11 @@ public class DrtDAO extends EgovAbstractDAO { insert("Drt.addAgntPopAjax", agntVO); } + /* + * 2022.11.14. + * 기존 유지보수 코드 update + * */ + public int updateAppResultTyChg(DrtVO drtVO) throws Exception { + return (Integer) update("Drt.updateAppResultTyChg", drtVO); + } } diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/drt/service/impl/DrtServiceImpl.java b/src/main/java/kcc/kccadr/adjPgrMgr/drt/service/impl/DrtServiceImpl.java index fea2fcec..4cc5e005 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/drt/service/impl/DrtServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/drt/service/impl/DrtServiceImpl.java @@ -477,6 +477,14 @@ public class DrtServiceImpl implements DrtService { return 1; } - + + /* + * 2022.11.14. + * 기존 유지보수 코드 update + * */ + @Override + public int updateAppResultTyChg(DrtVO drtVO) throws Exception { + return drtDAO.updateAppResultTyChg(drtVO); + } } diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/drt/web/DrtController.java b/src/main/java/kcc/kccadr/adjPgrMgr/drt/web/DrtController.java index 1e8f27ec..1902c66e 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/drt/web/DrtController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/drt/web/DrtController.java @@ -999,4 +999,35 @@ public class DrtController { } return dntVO; } + + /* + * 2022.11.14. + * 기존 유지보수 코드 update + * */ + /** + * 기일조서상세 - 기일결과 '불성립'으로 변경 ajax + * + * @param drtVO + * @param model + * @return + * @throws Exception + */ + @RequestMapping("appResultTyChgAjax.do") + public ModelAndView appResultTyChg(@ModelAttribute("drtVO") DrtVO drtVO, ModelMap model, RedirectAttributes redirectAttributes, final MultipartHttpServletRequest multiRequest) throws Exception { + setUpdInfo(drtVO); + + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + try { + drtService.updateAppResultTyChg(drtVO); + modelAndView.addObject("result", "success"); + } catch (Exception e) { + modelAndView.addObject("result", "fail"); + } + + + + + return modelAndView; + } } diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/iam/service/impl/InternalApprovManageDAO.java b/src/main/java/kcc/kccadr/adjPgrMgr/iam/service/impl/InternalApprovManageDAO.java index fe5cb493..3664807c 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/iam/service/impl/InternalApprovManageDAO.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/iam/service/impl/InternalApprovManageDAO.java @@ -47,5 +47,12 @@ public class InternalApprovManageDAO extends EgovAbstractDAO { return (List) list("internalApprovManageDAO.selectInternalApprovManageEndResult", internalApprovManageVO); } + /* + * 2022.11.14. + * 기존 유지보수 코드 update + * */ + public void deleteSbmtMgr(InternalApprovManageVO internalApprovManageVO) throws Exception { + delete("internalApprovManageDAO.deleteSbmtMgr", internalApprovManageVO); + } } diff --git a/src/main/java/kcc/kccadr/adjcclt/web/AdjstConciliatorController.java b/src/main/java/kcc/kccadr/adjcclt/web/AdjstConciliatorController.java index 587301af..24231188 100644 --- a/src/main/java/kcc/kccadr/adjcclt/web/AdjstConciliatorController.java +++ b/src/main/java/kcc/kccadr/adjcclt/web/AdjstConciliatorController.java @@ -332,7 +332,14 @@ public class AdjstConciliatorController { // 기일정보 변경 정보로 받아오기 20220127 우영두 수정 // 1개 이상의 기일변경을 요청한 경우 조정 기일 정보를 group_concat 으로 받아와서 현재 요청 날짜와 이전 날짜를 함께 보여줌 - // 변경승인이 완료된 리스트만 불러옴 - adjstConciliatorVO.setChgSts("Y"); + + /* + * 2022.11.14. + * 기존 유지보수 코드 update + * */ +// adjstConciliatorVO.setChgSts("Y"); + + List fixedDateList = adjstConciliatorService .selectAdjstConciliatorChangeDateList(adjstConciliatorVO); decryptInfomation(fixedDateList, null); diff --git a/src/main/java/kcc/kccadr/adjreqmgr/web/AdjReqMgrController.java b/src/main/java/kcc/kccadr/adjreqmgr/web/AdjReqMgrController.java index 6229dd05..63bd7fd4 100644 --- a/src/main/java/kcc/kccadr/adjreqmgr/web/AdjReqMgrController.java +++ b/src/main/java/kcc/kccadr/adjreqmgr/web/AdjReqMgrController.java @@ -321,10 +321,28 @@ public class AdjReqMgrController { if (!StringUtil.isEmpty(model.getResPonDentNm())) { String tmpStr = ""; + + /* + * 2022.11.14. + * 기존 유지보수 코드 update + * */ + String tmpResPonDentNm = model.getResPonDentNm(); + if(model.getResPonDentNm().contains("외")) { tmpStr = model.getResPonDentNm().substring(model.getResPonDentNm().length()-3); + /* + * 2022.11.14. + * 기존 유지보수 코드 update + * */ + tmpResPonDentNm = model.getResPonDentNm().substring(0, model.getResPonDentNm().length()-3); + } - model.setResPonDentNm(egovCryptoUtil.decrypt(model.getResPonDentNm()) + " " + tmpStr); + /* + * 2022.11.14. + * 기존 유지보수 코드 update + * */ + model.setResPonDentNm(egovCryptoUtil.decrypt(tmpResPonDentNm) + " " + tmpStr); +// model.setResPonDentNm(egovCryptoUtil.decrypt(model.getResPonDentNm()) + " " + tmpStr); } model.setAppliCantNm(egovCryptoUtil.decrypt(model.getAppliCantNm())); diff --git a/src/main/java/kcc/kccadr/cmm/KccadrConstants.java b/src/main/java/kcc/kccadr/cmm/KccadrConstants.java index 90a69f15..076f3899 100644 --- a/src/main/java/kcc/kccadr/cmm/KccadrConstants.java +++ b/src/main/java/kcc/kccadr/cmm/KccadrConstants.java @@ -137,7 +137,18 @@ public class KccadrConstants { public static final String ADR_APP_NTC_POSTNO_REG = "206050"; // 기일통지서 송장번호 등록(211104 추가) public static final String ADR_APP_PRGRS = "207050"; // 기일진행(211104 추가) public static final String ADR_APP_PRGRS_NOT = "207010"; // 기일미진행(211104 추가) - + + /* + * 2022.11.14. + * 기존 유지보수 코드 update + * */ + // 조정진행중-배당 전 취하종결 + public static final String ADR_DEPTBFRCNCL_PAY_COMP = "300001"; // 배당 전 취하종결 - 입금완료 + public static final String ADR_DEPTBFRCNCL_ADR_RCPT_COMP = "300002"; // 배당 전 취하종결 - 조정접수 + public static final String ADR_DEPTBFRCNCL_RCPT_APPR_REQ = "300003"; // 배당 전 취하종결 - 접수결재 요청 + public static final String ADR_DEPTBFRCNCL_RCPT_APPR_COMP = "300004"; // 배당 전 취하종결 - 접수결재 완료 + public static final String ADR_DEPTBFRCNCL_ADR_RCPT_DTB_REQ = "300005"; // 배당 전 취하종결 - 배당결재 요청 + // 조정진행중-기일후 public static final String ADR_KJOSU_APPR_REQ = "302010"; // 기일조서 결재요청 public static final String ADR_KJOSU_APPR_COMP = "302050"; // 기일조서 결재완료 diff --git a/src/main/resources/egovframework/sqlmap/kccadr/accdnt/ars/AdjustReqStatus_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/accdnt/ars/AdjustReqStatus_SQL_Mysql.xml index ca388df0..bb270170 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/accdnt/ars/AdjustReqStatus_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/accdnt/ars/AdjustReqStatus_SQL_Mysql.xml @@ -203,7 +203,7 @@ FROM ADR_HSTRY WHERE 1 =1 AND ADR_SEQ = #adrSeq# - AND stat_cd like '%50' + AND ( stat_cd like '%50' OR stat_cd LIKE '30000%') AND ( stat_cd IN ( '101050') OR stat_cd >'200000' 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 d7b646bf..dde5ba60 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 @@ -1003,5 +1003,23 @@ ORDER BY m.adr_seq desc + + + + + + UPDATE adr_mgr_detail + SET adr_adm_id = #adrAdmId# + WHERE adr_seq = #adrSeq# + + + 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 d547ee87..fb4dc243 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 @@ -265,7 +265,7 @@ /*신청인*/ AP.RPPL_SEQ AS appliCantId, /* 신청인ID */ - ( SELECT GROUP_CONCAT ( RPPL_NM SEPARATOR ', ' ) + ( SELECT GROUP_CONCAT ( RPPL_NM SEPARATOR '§ ' ) FROM ADR_RPPL S1 WHERE S1.ADR_SEQ = M.ADR_SEQ AND S1.RPPL_TY = '30' diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/drt/Drt_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/drt/Drt_SQL_Mysql.xml index 605de319..fa3c873d 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/drt/Drt_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/drt/Drt_SQL_Mysql.xml @@ -333,7 +333,16 @@ AND ADR_SN = #adrSn# AND PRTCL_SEQ = #prtclSeq# - + + + + UPDATE adr_prtcl_mgr a + SET a.app_result_ty = '20' + WHERE adr_seq = #adrSeq# + AND adr_sn = #adrSn# + AND a.prtcl_seq = #prtclSeq# + + diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/iam/IamManage_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/iam/IamManage_SQL_Mysql.xml index 9b96bfad..faa5b9be 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/iam/IamManage_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/iam/IamManage_SQL_Mysql.xml @@ -899,5 +899,13 @@ AND a.stat_cd LIKE '%50' ORDER BY a.stat_cd DESC - + + + + DELETE + FROM adr_sbmt_mgr + WHERE adr_seq = #adrSeq# + AND sbmt_ty = #sbmtTy# + + 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 06c22344..e39ebb23 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 @@ -358,6 +358,133 @@ $(document).ready(function(){ var pop = document.pop; commonPopWindowopenForm("/kccadr/adjPgrMgr/apm/popup/smsSendPop.do", '820', '500', "smsSendPop", $('#pop')); } + + //배당전취하종결 - 조정조사관 지정 + function fncEntCloseAdrAdminReg() { + /* + 1. 조정조사관이 있는가 + 1) 있다면 fncEntCloseDocRegYn()- 사건문서 취하신청서 등록 여부 함수 호출 + 2) 없다면 조정조사관 등록 팝업 호출 commonPopWindowopenForm("/kccadr/adjPgrMgr/dtb/popup/srcAdmIdPop.do", "650", "400", "srcAdmId", $("#popForm")); + 2-1) 등록 팝업에서 등록을 하든 안하든 부모창 location.reload(true) + */ + + /* 1) 조정조사관이 있는지 확인 */ + var adrAdminId = ''; + + if(adrAdminId == '' || adrAdminId == null){ + alert("조정조사관이 지정되어있지 않습니다. 조정조사관을 등록해주세요."); + commonPopWindowopenForm("/kccadr/adjPgrMgr/dtb/popup/srcAdmIdPop.do", "650", "400", "adrAdmId", $("#popForm")); + }else{ + fncEntCloseDocRegYn(); + } + + } + + //조정조사관 등록 팝업 callback + function setAdmId(admId0) { + document.popForm.adrAdmId.value = admId0; + var data = new FormData(document.getElementById("popForm")); + + // ajax 사건문서 취하신청서 등록 여부 + $.ajax({ + type : "POST", + url : "/kccadr/adjPgrMgr/apm/entBeforeDtbAdrAdminRegAjax.do", + data : data, + dataType : 'json', + async : false, + processData : false, + contentType : false, + cache : false, + success : function(returnData, status) { + if (returnData.result == 'SUCCESS') { + alert("조정조사관이 등록되었습니다."); + location.reload(true); + } else { + alert("조정조사관등록에 실패하였습니다."); + location.reload(true); + } + }, + error : function(e) { + alert("요청에 실패하였습니다."); + console.log("ERROR : ", e); + } + }); + + } + + //배당전취하종결 - 사건문서 취하신청서 등록 여부 + function fncEntCloseDocRegYn(){ + var data = new FormData(document.getElementById("pop")); + var entCloseDocYn = true; + + // ajax 사건문서 취하신청서 등록 여부 + $.ajax({ + type : "POST", + url : "/kccadr/adjPgrMgr/apm/entBeforeDtbCheckAjax.do", + data : data, + dataType : 'json', + async : false, + processData : false, + contentType : false, + cache : false, + success : function(returnData, status) { + if (returnData.result == 'SUCCESS') { + if(returnData.entCloseDocCnt == 0){ + entCloseDocYn = false; + } + } else { + } + }, + error : function(e) { + alert("요청에 실패하였습니다."); + console.log("ERROR : ", e); + } + }); + + if(!entCloseDocYn){ + var confirmYn = confirm("등록된 취하신청 문서가 없습니다. 취하신청문서가 있다면 사건문서->문서등록을 통해 등록해주세요. 계속 진행하시겠습니까?"); + + if(confirmYn){ + fncEntBeforeDtb(); + }else{ + return false; + } + }else{ + fncEntBeforeDtb(); + } + } + + // 배당전 취하종결 처리 + function fncEntBeforeDtb(){ + var data = new FormData(document.getElementById("entForm")); + + /* ajax 취하종결 처리 + 입금완료, 조정접수, 접수결재요청, 접수결재완료, 조정부지정 일 경우 처리 + 결재 요청(접수결재요청, 배당결재요청 상태)에서 버튼 클릭 시 요청된 결재는 삭제 + */ + $.ajax({ + type : "POST", + url : "/kccadr/adjPgrMgr/apm/entBeforeDtbAjax.do", + data : data, + dataType : 'json', + async : false, + processData : false, + contentType : false, + cache : false, + success : function(returnData, status) { + if (returnData.result == 'SUCCESS') { + alert("배당전 취하종결 처리되었습니다."); + location.reload(true); + }else{ + alert("등록에 실패하였습니다. 조정상태를 확인해주세요.") + } + }, + error : function(e) { + alert("요청에 실패하였습니다."); + console.log("ERROR : ", e); + } + }); + } @@ -460,6 +587,16 @@ $(document).ready(function(){ +
+ " /> + " /> + + +
+
+ " /> + +
" />
@@ -518,6 +655,7 @@ $(document).ready(function(){ @@ -531,6 +669,9 @@ $(document).ready(function(){ && (info.statCd < KccadrConstants.ADR_CNCLTBS_APPR_REQ || info.statCd > KccadrConstants.ADR_CNCLTBS_RETN) + && + (not empty apmChgDateList + || info.statCd== KccadrConstants.ADR_DEPT_SLCT_COMP) }"> @@ -621,7 +762,7 @@ $(document).ready(function(){ - + @@ -989,6 +1130,18 @@ $(document).ready(function(){ --> + + <%-- 배당전취하종결 버튼 노출 + 입금완료(ADR_PAY_COMP, 104050)보다 같거나 크고 + 배당결재요청(ADR_RCPT_DTB_REQ, 202010) 보다 같거나 작은경우 + 또는 + 조정접수 상태일 경우(ADR_RCPT_COMP, 101050) + --%> + + + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/addRpplPop.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/addRpplPop.jsp index 11573cc3..202b2eb1 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/addRpplPop.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/addRpplPop.jsp @@ -6,6 +6,7 @@ <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> <%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator"%> +<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> <% /** * @Class Name : srcAdmNoPop.jsp @@ -182,7 +183,7 @@ @ - + + @@ -1223,7 +1225,7 @@ function fn_adjReqMgr_update() { @ - + + @@ -1497,7 +1501,7 @@ function fn_adjReqMgr_update() { @ - + + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/docRegPop.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/docRegPop.jsp index 8028f5f9..3bda36b7 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/docRegPop.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/docRegPop.jsp @@ -172,6 +172,14 @@ } //관련 문서 전체 else if(divVal == '70'){ + var adrAdmNm = ""; + + if(adrAdmNm == '' || adrAdmNm == null){ + alert('조정조사관이 지정되어있지 않습니다. 배당결재 이후 등록해 주세요. 배당전취하종결의 경우 \'배당전취하종결 버튼을 통해 조정조사관을 지정해 주세요.\''); + $('#adrDocTy').find('option[value=10]').prop('selected', true); + docTypeDiv('10'); + return false; + } //신청인 $('#rpplSeq').find('option[name=10]').prop('disabled', true); $('#rpplSeq').find('option[name=10]').prop('selected', false); @@ -387,6 +395,7 @@ + <%-- --%>

diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dnt/dntDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dnt/dntDetail.jsp index 727749a4..3114ee34 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dnt/dntDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dnt/dntDetail.jsp @@ -515,7 +515,8 @@ 주소 - +<%-- --%> +