From 3b7f573da2423b1bda12eb36d527d326459f7264 Mon Sep 17 00:00:00 2001 From: myname Date: Mon, 5 Sep 2022 11:52:46 +0900 Subject: [PATCH] =?UTF-8?q?2022-09-05=2011:52=20=EC=9D=B4=EB=A0=A5?= =?UTF-8?q?=EA=B4=80=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adjPgrMgr/arm/web/ArmController.java | 31 ++++++++- .../adjPgrMgr/dnt/service/DntService.java | 5 +- .../dnt/service/impl/DntServiceImpl.java | 5 +- .../adjPgrMgr/drt/service/DrtService.java | 10 ++- .../drt/service/impl/DrtServiceImpl.java | 63 +++++++++++++++++-- .../adjPgrMgr/drt/web/DrtController.java | 21 +++++-- .../kccadr/advc/AdrHstryMgr_SQL_Cubrid.xml | 2 +- .../jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp | 3 +- 8 files changed, 120 insertions(+), 20 deletions(-) diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/arm/web/ArmController.java b/src/main/java/kcc/kccadr/adjPgrMgr/arm/web/ArmController.java index 8c3de09b..ed8eb4e3 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/arm/web/ArmController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/arm/web/ArmController.java @@ -37,6 +37,7 @@ import kcc.kccadr.adjPgrMgr.drtctr.service.DrtCtrService; import kcc.kccadr.adjPgrMgr.drtctr.service.DrtCtrVO; import kcc.kccadr.adjcclt.service.AdjstConciliatorService; import kcc.kccadr.adjcclt.service.AdjstConciliatorVO; +import kcc.kccadr.advc.service.AdrHstryMgrService; import kcc.kccadr.kccadrCom.service.KccadrMgrUdtService; import kcc.kccadr.ozSchd.web.OzSchdExportUtil; @@ -84,6 +85,10 @@ public class ArmController { @Resource(name = "drtCtrService") private DrtCtrService drtCtrService; + // 이력관리 + @Resource(name = "adrHstryMgrService") + private AdrHstryMgrService adrHstryMgrService; + // 실서버 개발서버 구분 private static String islocal; // /pdf/out/ @Value("#{globalSettings['Globals.prod.islocal']}") @@ -147,7 +152,10 @@ public class ArmController { */ closeVO.setCloseDocTy("30"); // 30 조정권고안 - cmmService.insertCloseDoc(closeVO); + cmmService.insertCloseDoc(closeVO + , "조정진행관리>>조정진행목록>조정진행상세>사건문서>조정권고안-등록" //String p_code_desc - CC199 + , "A460" //String p_stat_cd + ); /* @@ -253,7 +261,10 @@ public class ArmController { ModelAndView modelAndView = new ModelAndView(); modelAndView.setViewName("jsonView"); - cmmService.updateCloseDoc(closeVO); + cmmService.updateCloseDoc(closeVO + , "조정진행관리>>조정진행목록>조정진행상세>사건문서>조정권고안-수정" //String p_code_desc - CC199 + , "A470" //String p_stat_cd + ); modelAndView.addObject("result", "success"); @@ -279,7 +290,10 @@ public class ArmController { ModelAndView modelAndView = new ModelAndView(); modelAndView.setViewName("jsonView"); - cmmService.deleteCloseDoc(closeVO); + cmmService.deleteCloseDoc(closeVO + , "조정진행관리>>조정진행목록>조정진행상세>사건문서>조정권고안-삭제" //String p_code_desc - CC199 + , "A480" //String p_stat_cd + ); modelAndView.addObject("result", "success"); @@ -356,6 +370,17 @@ public class ArmController { } + //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 + //adr_hstry_mgr에 값 넣기 - 시작 + adrHstryMgrService.insert4Func(result.getAdrSeq() + , "조정진행관리>>조정진행목록>조정진행상세>사건문서>조정권고안>출력" //String p_code_desc - CC199 + , "V490" //String p_stat_cd + , result.getFrstRegisterId() + , result.getLastUpdusrId() + ); + //adr_hstry_mgr에 값 넣기 - 끝 + + return "/kccadr/adjPgrMgr/arm/report/adrKkaAgrReport"; } diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/dnt/service/DntService.java b/src/main/java/kcc/kccadr/adjPgrMgr/dnt/service/DntService.java index 0ef192e4..6e303aae 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/dnt/service/DntService.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/dnt/service/DntService.java @@ -42,6 +42,9 @@ public interface DntService { //기일통지서 승인요청시 기일관리 테이블에 위원의 반려 일자 수정해주기 void dntUpdApprYnN(DntVO dntVO) throws Exception; - void updateDistribution2(DrtVO drtVO) throws Exception; + void updateDistribution2(DrtVO drtVO + , String p_code_desc + , String p_stat_cd + ) throws Exception; } diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/dnt/service/impl/DntServiceImpl.java b/src/main/java/kcc/kccadr/adjPgrMgr/dnt/service/impl/DntServiceImpl.java index aa0bc1b7..6d6d01cc 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/dnt/service/impl/DntServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/dnt/service/impl/DntServiceImpl.java @@ -229,7 +229,10 @@ public class DntServiceImpl implements DntService { } @Override - public void updateDistribution2(DrtVO drtVO) throws Exception { + public void updateDistribution2(DrtVO drtVO + , String p_code_desc + , String p_stat_cd + ) throws Exception { if (!StringUtil.isEmpty(drtVO.getAddUsrId0())) { 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 5a30d56e..a412c352 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/drt/service/DrtService.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/drt/service/DrtService.java @@ -5,7 +5,10 @@ import java.util.List; public interface DrtService { - int udateDateReport(DrtVO drtVO) throws Exception; + int udateDateReport(DrtVO drtVO + , String p_code_desc + , String p_stat_cd + ) throws Exception; int insertDateReport(DrtVO drtVO , String p_code_desc @@ -20,7 +23,10 @@ public interface DrtService { DrtVO selectAdrPrtclMgr(DrtVO drtVO) throws Exception; - int addAgntPopAjax(AgntVO agntVO) throws Exception; + int addAgntPopAjax(AgntVO agntVO + , String p_code_desc + , String p_stat_cd + ) throws Exception; List selectAdrPrtclMgrEndDetail(DrtVO drtVO) throws Exception; 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 ab4d8a45..6317ef2d 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 @@ -15,6 +15,7 @@ import kcc.kccadr.adjPgrMgr.drt.service.AgntVO; import kcc.kccadr.adjPgrMgr.drt.service.AssVO; import kcc.kccadr.adjPgrMgr.drt.service.DrtService; import kcc.kccadr.adjPgrMgr.drt.service.DrtVO; +import kcc.kccadr.advc.service.impl.AdrHstryMgrDAO; import kcc.let.utl.fcc.service.EgovCryptoUtil; @Repository("drtService") @@ -37,12 +38,18 @@ public class DrtServiceImpl implements DrtService { @Resource(name = "egovPrtclManageGnrService") private EgovIdGnrService idgenPrtclSeqService; - + // 조정사건이력관리 DAO + @Resource(name = "adrHstryMgrDAO") + private AdrHstryMgrDAO adrHstryMgrDAO; + @Transactional @Override - public int udateDateReport(DrtVO drtVO) throws Exception { + public int udateDateReport(DrtVO drtVO + , String p_code_desc + , String p_stat_cd + ) throws Exception { setDayNoticeInfo(drtVO); // 02. 기일배석관리 ( 출석 여부 세팅) @@ -87,8 +94,21 @@ public class DrtServiceImpl implements DrtService { // 03. 기일조서관리 ( 다음기일 세팅) - return drtDAO.udateDateReport03(drtVO); + int rs = drtDAO.udateDateReport03(drtVO); + + //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 + //adr_hstry_mgr에 값 넣기 - 시작 + adrHstryMgrDAO.insert4Func(drtVO.getAdrSeq() + //, "상태코드수정" + , p_code_desc + //, adjReqMgrVO.getStatCd() + , p_stat_cd + + , drtVO.getFrstRegisterId() + , drtVO.getLastUpdusrId()); + //adr_hstry_mgr에 값 넣기 - 끝 + return rs; } @Transactional @@ -111,6 +131,7 @@ public class DrtServiceImpl implements DrtService { drtVO.setAddYn(assArr[2]); drtDAO.insertDateReport02(drtVO); + } @@ -128,6 +149,7 @@ public class DrtServiceImpl implements DrtService { if(StringUtil.isNotEmpty(drtVO.getAgntSeq())) { log.debug(">>>>>>>>>>>.agnt:"+drtVO.getAgntSeq()+":"+drtVO.getAddYn()); drtDAO.insertDateReport02(drtVO); + } } @@ -138,6 +160,19 @@ public class DrtServiceImpl implements DrtService { drtVO.setPrtclSeq(idgenPrtclSeqService.getNextStringId()); // idgenPrtclSeqService // 03. 기일조서관리 ( 다음기일 세팅) drtDAO.insertDateReport03(drtVO); + + //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 + //adr_hstry_mgr에 값 넣기 - 시작 + adrHstryMgrDAO.insert4Func(drtVO.getAdrSeq() + //, "상태코드수정" + , p_code_desc + //, adjReqMgrVO.getStatCd() + , p_stat_cd + + , drtVO.getFrstRegisterId() + , drtVO.getLastUpdusrId()); + //adr_hstry_mgr에 값 넣기 - 끝 + return 1; } @@ -235,9 +270,10 @@ public class DrtServiceImpl implements DrtService { } @Override - public int addAgntPopAjax(AgntVO agntVO) throws Exception { - - + public int addAgntPopAjax(AgntVO agntVO + , String p_code_desc + , String p_stat_cd + ) throws Exception { agntVO.setAgntAddr(egovCryptoUtil.encrypt(agntVO.getAgntAddr())); @@ -253,6 +289,21 @@ public class DrtServiceImpl implements DrtService { agntVO.setAgntRealPost(egovCryptoUtil.encrypt(agntVO.getAgntRealPost())); drtDAO.addAgntPopAjax(agntVO); + + + //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 + //adr_hstry_mgr에 값 넣기 - 시작 + adrHstryMgrDAO.insert4Func(agntVO.getAdrSeq() + //, "상태코드수정" + , p_code_desc + //, adjReqMgrVO.getStatCd() + , p_stat_cd + + , agntVO.getFrstRegisterId() + , agntVO.getLastUpdusrId()); + //adr_hstry_mgr에 값 넣기 - 끝 + + return 1; } 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 edd0f0a3..0c9ecb68 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/drt/web/DrtController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/drt/web/DrtController.java @@ -206,7 +206,10 @@ public class DrtController { agntVO.setFrstRegisterId(userId); agntVO.setLastUpdusrId(userId); - int rs = drtService.addAgntPopAjax(agntVO); + int rs = drtService.addAgntPopAjax(agntVO + , "사용자>>나의사건관리>조정진행 상황>조정진행 상세>조정대리신청-등록" //String p_code_desc - CC199 + , "A440" //String p_stat_cd + ); modelAndView.addObject("result", "success"); @@ -256,7 +259,10 @@ public class DrtController { //대석 등록 - dntService.updateDistribution2(drtVO); + dntService.updateDistribution2(drtVO + , "사용자>>나의사건관리>조정진행 상황>조정진행 상세>조정대리신청-수정" //String p_code_desc - CC199 + , "A450" //String p_stat_cd + ); /* AdjReqMgrVO arv = new AdjReqMgrVO(); @@ -329,10 +335,17 @@ public class DrtController { ModelAndView modelAndView = new ModelAndView(); modelAndView.setViewName("jsonView"); - drtService.udateDateReport(drtVO); + //기일조서수정 + drtService.udateDateReport(drtVO + , "조정진행관리>>조정진행목록>조정진행상세>사건문서>기일조서등록-수정" //String p_code_desc - CC199 + , "A400" //String p_stat_cd + ); //대석 등록 - dntService.updateDistribution2(drtVO); + dntService.updateDistribution2(drtVO + , "사용자>>나의사건관리>조정진행 상황>조정진행 상세>조정대리신청-수정" //String p_code_desc - CC199 + , "A450" //String p_stat_cd + ); modelAndView.addObject("result", "success"); diff --git a/src/main/resources/egovframework/sqlmap/kccadr/advc/AdrHstryMgr_SQL_Cubrid.xml b/src/main/resources/egovframework/sqlmap/kccadr/advc/AdrHstryMgr_SQL_Cubrid.xml index 2cc85a0d..5ca81efe 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/advc/AdrHstryMgr_SQL_Cubrid.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/advc/AdrHstryMgr_SQL_Cubrid.xml @@ -142,7 +142,7 @@ - + ORDER BY a.frst_regist_pnttm 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 8d97bfd2..1f7bb027 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 @@ -808,8 +808,7 @@ $(document).ready(function(){ - - +