diff --git a/src/main/java/kcc/kccadr/accdnt/awd/service/AdjstWithDrawService.java b/src/main/java/kcc/kccadr/accdnt/awd/service/AdjstWithDrawService.java index 87a01f74..8d5ba278 100644 --- a/src/main/java/kcc/kccadr/accdnt/awd/service/AdjstWithDrawService.java +++ b/src/main/java/kcc/kccadr/accdnt/awd/service/AdjstWithDrawService.java @@ -4,9 +4,15 @@ public interface AdjstWithDrawService { AdjstWithDrawVO selectAdjstWithDrawInfo(AdjstWithDrawVO adjstWithDrawVO) throws Exception; - Integer insertAndUpdateAdjstWithDrawSave(AdjstWithDrawVO adjstWithDrawVO) throws Exception; + Integer insertAndUpdateAdjstWithDrawSave(AdjstWithDrawVO adjstWithDrawVO + , String p_code_desc + , String p_stat_cd + ) throws Exception; - Integer deleteAdjstWithDraw(AdjstWithDrawVO adjstWithDrawVO) throws Exception; + Integer deleteAdjstWithDraw(AdjstWithDrawVO adjstWithDrawVO + , String p_code_desc + , String p_stat_cd + ) throws Exception; int updateAdjstWithDrawSubmit(AdjstWithDrawVO adjstWithDrawVO) throws Exception; } diff --git a/src/main/java/kcc/kccadr/accdnt/awd/service/impl/AdjstWithDrawServiceImpl.java b/src/main/java/kcc/kccadr/accdnt/awd/service/impl/AdjstWithDrawServiceImpl.java index bea274bc..74baae44 100644 --- a/src/main/java/kcc/kccadr/accdnt/awd/service/impl/AdjstWithDrawServiceImpl.java +++ b/src/main/java/kcc/kccadr/accdnt/awd/service/impl/AdjstWithDrawServiceImpl.java @@ -8,6 +8,7 @@ import org.springframework.stereotype.Service; import egovframework.rte.fdl.idgnr.EgovIdGnrService; import kcc.kccadr.accdnt.awd.service.AdjstWithDrawService; import kcc.kccadr.accdnt.awd.service.AdjstWithDrawVO; +import kcc.kccadr.advc.service.impl.AdrHstryMgrDAO; @Service("adjstWithDrawService") public class AdjstWithDrawServiceImpl implements AdjstWithDrawService { @@ -18,23 +19,62 @@ public class AdjstWithDrawServiceImpl implements AdjstWithDrawService { @Resource(name="egovCancleManageGnrService") private EgovIdGnrService cancleIdgen; + // 조정사건이력관리 DAO + @Resource(name = "adrHstryMgrDAO") + private AdrHstryMgrDAO adrHstryMgrDAO; + @Override public AdjstWithDrawVO selectAdjstWithDrawInfo(AdjstWithDrawVO adjstWithDrawVO) throws Exception { return adjstWithDrawDAO.selectAdjstWithDrawInfo(adjstWithDrawVO); } @Override - public Integer insertAndUpdateAdjstWithDrawSave(AdjstWithDrawVO adjstWithDrawVO) throws Exception { + public Integer insertAndUpdateAdjstWithDrawSave(AdjstWithDrawVO adjstWithDrawVO + , String p_code_desc + , String p_stat_cd + ) throws Exception { AdjstWithDrawVO info = selectAdjstWithDrawInfo(adjstWithDrawVO); if(info == null){ adjstWithDrawVO.setAdrCnclSeq(cancleIdgen.getNextStringId()); } - return adjstWithDrawDAO.insertAndUpdateAdjstWithDrawSave(adjstWithDrawVO); + + int rs = adjstWithDrawDAO.insertAndUpdateAdjstWithDrawSave(adjstWithDrawVO); + + //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 + //adr_hstry_mgr에 값 넣기 - 시작 + adrHstryMgrDAO.insert4Func(adjstWithDrawVO.getAdrSeq() + //, "상태코드수정" + , p_code_desc + //, adjReqMgrVO.getStatCd() + , p_stat_cd + + , adjstWithDrawVO.getFrstRegisterId() + , adjstWithDrawVO.getLastUpdusrId()); + //adr_hstry_mgr에 값 넣기 - 끝 + + return rs; } @Override - public Integer deleteAdjstWithDraw(AdjstWithDrawVO adjstWithDrawVO) throws Exception { - return adjstWithDrawDAO.deleteAdjstWithDraw(adjstWithDrawVO); + public Integer deleteAdjstWithDraw(AdjstWithDrawVO adjstWithDrawVO + , String p_code_desc + , String p_stat_cd + ) throws Exception { + int rs = adjstWithDrawDAO.deleteAdjstWithDraw(adjstWithDrawVO); + + //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 + //adr_hstry_mgr에 값 넣기 - 시작 + adrHstryMgrDAO.insert4Func(adjstWithDrawVO.getAdrSeq() + //, "상태코드수정" + , p_code_desc + //, adjReqMgrVO.getStatCd() + , p_stat_cd + + , adjstWithDrawVO.getFrstRegisterId() + , adjstWithDrawVO.getLastUpdusrId()); + //adr_hstry_mgr에 값 넣기 - 끝 + + return rs; } @Override diff --git a/src/main/java/kcc/kccadr/accdnt/awd/web/AdjstWithDrawController.java b/src/main/java/kcc/kccadr/accdnt/awd/web/AdjstWithDrawController.java index 5830c13e..e5ff0503 100644 --- a/src/main/java/kcc/kccadr/accdnt/awd/web/AdjstWithDrawController.java +++ b/src/main/java/kcc/kccadr/accdnt/awd/web/AdjstWithDrawController.java @@ -21,7 +21,6 @@ import kcc.kccadr.accdnt.awd.service.AdjstWithDrawService; import kcc.kccadr.accdnt.awd.service.AdjstWithDrawVO; import kcc.kccadr.accdnt.crtfc.service.CrtfcService; import kcc.kccadr.cmm.KccadrConstants; -import kcc.let.uss.umt.service.MberManageVO; /** * 대국민(사용자) @@ -82,7 +81,12 @@ public class AdjstWithDrawController { adjstWithDrawVO.setFrstRegisterId(userId); - int rs = adjstWithDrawService.insertAndUpdateAdjstWithDrawSave(adjstWithDrawVO); + //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 + int rs = adjstWithDrawService.insertAndUpdateAdjstWithDrawSave(adjstWithDrawVO + , "사용자>>나의사건관리>조정진행 상황>조정진행 상세>조정취하등록" //String p_code_desc - CC199 + , "C270" //String p_stat_cd + ); + modelAndView.addObject("rs", (rs>0)); return modelAndView; } @@ -91,7 +95,12 @@ public class AdjstWithDrawController { public ModelAndView adjstWithDrawDelete(HttpServletRequest request , @RequestBody AdjstWithDrawVO adjstWithDrawVO) throws Exception { ModelAndView modelAndView = new ModelAndView(); modelAndView.setViewName("jsonView"); - int rs = adjstWithDrawService.deleteAdjstWithDraw(adjstWithDrawVO); + + //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 + int rs = adjstWithDrawService.deleteAdjstWithDraw(adjstWithDrawVO + , "사용자>>나의사건관리>조정진행 상황>조정진행 상세>조정취하등록-삭제" //String p_code_desc - CC199 + , "C280" //String p_stat_cd + ); modelAndView.addObject("rs", (rs>0)); return modelAndView; } @@ -126,7 +135,12 @@ public class AdjstWithDrawController { /*if(crtfcSn.equals(sn)) {*/ adjstWithDrawVO.setSbmtYn("Y"); /*rs = adjstWithDrawService.updateAdjstWithDrawSubmit(adjstWithDrawVO);*/ - rs = adjstWithDrawService.insertAndUpdateAdjstWithDrawSave(adjstWithDrawVO); + + //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 + rs = adjstWithDrawService.insertAndUpdateAdjstWithDrawSave(adjstWithDrawVO + , "사용자>>나의사건관리>조정진행 상황>조정진행 상세>조정취하등록-제출" //String p_code_desc - CC199 + , "C290" //String p_stat_cd + ); if(rs > 0) { modelAndView.addObject("status", "success"); } else { 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 9b99d862..6534c946 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java @@ -527,7 +527,11 @@ public class ApmController { } - int resultCnt = entService.updateEntApprYnInfo(entVO); + //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 + int resultCnt = entService.updateEntApprYnInfo(entVO + , "조정진행관리>>조정진행목록>조정진행상세>사건문서>취하신청사유>P>취하신청상세-처리" //String p_code_desc - CC199 + , "A330" //String p_stat_cd - 취하처리 + ); if(resultCnt > 0) { @@ -858,7 +862,10 @@ public class ApmController { adjstWithDrawVO.setFrstRegisterId(userId); - int rs = adjstWithDrawService.insertAndUpdateAdjstWithDrawSave(adjstWithDrawVO); + int rs = adjstWithDrawService.insertAndUpdateAdjstWithDrawSave(adjstWithDrawVO + , "조정진행관리>>조정진행목록>조정진행상세>사건문서>취하신청등록" //String p_code_desc - CC199 + , "A300" //String p_stat_cd + ); modelAndView.addObject("rs", (rs>0)); return modelAndView; } @@ -874,7 +881,10 @@ public class ApmController { public ModelAndView adjstWithDrawDelete(HttpServletRequest request , @RequestBody AdjstWithDrawVO adjstWithDrawVO) throws Exception { ModelAndView modelAndView = new ModelAndView(); modelAndView.setViewName("jsonView"); - int rs = adjstWithDrawService.deleteAdjstWithDraw(adjstWithDrawVO); + int rs = adjstWithDrawService.deleteAdjstWithDraw(adjstWithDrawVO + , "조정진행관리>>조정진행목록>조정진행상세>사건문서>취하신청등록-삭제" //String p_code_desc - CC199 + , "A310" //String p_stat_cd + ); modelAndView.addObject("rs", (rs>0)); return modelAndView; } @@ -909,7 +919,10 @@ public class ApmController { /*if(crtfcSn.equals(sn)) {*/ adjstWithDrawVO.setSbmtYn("Y"); /*rs = adjstWithDrawService.updateAdjstWithDrawSubmit(adjstWithDrawVO);*/ - rs = adjstWithDrawService.insertAndUpdateAdjstWithDrawSave(adjstWithDrawVO); + rs = adjstWithDrawService.insertAndUpdateAdjstWithDrawSave(adjstWithDrawVO + , "조정진행관리>>조정진행목록>조정진행상세>사건문서>취하신청등록-제출" //String p_code_desc - CC199 + , "A320" //String p_stat_cd + ); if(rs > 0) { modelAndView.addObject("status", "success"); } else { 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 e6a64aa5..96c63d90 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/PgrCmmService.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/PgrCmmService.java @@ -12,13 +12,22 @@ public interface PgrCmmService { PgrCmmVO selectPgrCmm(PgrCmmVO pgrCmmVO) throws Exception; - void deleteCloseDoc(CloseVO closeVO) throws Exception; + void deleteCloseDoc(CloseVO closeVO + , String p_code_desc + , String p_stat_cd + ) throws Exception; - int updateCloseDoc(CloseVO closeVO) throws Exception; + int updateCloseDoc(CloseVO closeVO + , String p_code_desc + , String p_stat_cd + ) throws Exception; CloseVO selectCloseDoc(CloseVO closeVO) throws Exception; - void insertCloseDoc(CloseVO closeVO) throws Exception; + void insertCloseDoc(CloseVO closeVO + , String p_code_desc + , String p_stat_cd + ) throws Exception; CmntVO selectCmntInfo(CmntVO cmntVO) throws Exception; 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 f4827753..c46b6cbd 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 @@ -164,13 +164,19 @@ public class PgrCmmServiceImpl implements PgrCmmService { } @Override - public void deleteCloseDoc(CloseVO closeVO) throws Exception { + public void deleteCloseDoc(CloseVO closeVO + , String p_code_desc + , String p_stat_cd + ) throws Exception { pgrCmmDAO.deleteCloseDoc(closeVO); } @Override - public int updateCloseDoc(CloseVO closeVO) throws Exception { + public int updateCloseDoc(CloseVO closeVO + , String p_code_desc + , String p_stat_cd + ) throws Exception { return (Integer) pgrCmmDAO.updateCloseDoc(closeVO); } @@ -184,12 +190,26 @@ public class PgrCmmServiceImpl implements PgrCmmService { } @Override - public void insertCloseDoc(CloseVO closeVO) throws FdlException { + public void insertCloseDoc(CloseVO closeVO + , String p_code_desc + , String p_stat_cd + ) throws FdlException, Exception { closeVO.setCloseDoc(idgenService.getNextStringId()); pgrCmmDAO.insertCloseDoc(closeVO); + //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 + //adr_hstry_mgr에 값 넣기 - 시작 + adrHstryMgrDAO.insert4Func(closeVO.getAdrSeq() + //, "상태코드수정" + , p_code_desc + //, adjReqMgrVO.getStatCd() + , p_stat_cd + + , closeVO.getFrstRegisterId() + , closeVO.getLastUpdusrId()); + //adr_hstry_mgr에 값 넣기 - 끝 } @Override 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 1fb89200..5a30d56e 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/drt/service/DrtService.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/drt/service/DrtService.java @@ -7,7 +7,10 @@ public interface DrtService { int udateDateReport(DrtVO drtVO) throws Exception; - int insertDateReport(DrtVO drtVO) throws Exception; + int insertDateReport(DrtVO drtVO + , String p_code_desc + , String p_stat_cd + ) throws Exception; int deleteDateReport(DrtVO 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 d641deee..ab4d8a45 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 @@ -93,7 +93,10 @@ public class DrtServiceImpl implements DrtService { @Transactional @Override - public int insertDateReport(DrtVO drtVO) throws Exception { + public int insertDateReport(DrtVO drtVO + , String p_code_desc + , String p_stat_cd + ) throws Exception { setDayNoticeInfo(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 96639e31..edd0f0a3 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/drt/web/DrtController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/drt/web/DrtController.java @@ -248,7 +248,12 @@ public class DrtController { */ - drtService.insertDateReport(drtVO); + //조정기일배석관리, 기일조서관리 + drtService.insertDateReport(drtVO + , "조정진행관리>>조정진행목록>조정진행상세>사건문서>기일조서등록" //String p_code_desc - CC199 + , "A390" //String p_stat_cd + ); + //대석 등록 dntService.updateDistribution2(drtVO); diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/ent/service/EntService.java b/src/main/java/kcc/kccadr/adjPgrMgr/ent/service/EntService.java index 58ffea6f..94ae8b40 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/ent/service/EntService.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/ent/service/EntService.java @@ -7,6 +7,9 @@ public interface EntService { public EntVO selectEntInfo_2(EntVO entVO) throws Exception; - public int updateEntApprYnInfo(EntVO entVO) throws Exception; + public int updateEntApprYnInfo(EntVO entVO + , String p_code_desc + , String p_stat_cd + ) throws Exception; } diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/ent/service/impl/EntServiceImpl.java b/src/main/java/kcc/kccadr/adjPgrMgr/ent/service/impl/EntServiceImpl.java index a8cc0aa9..4c972cfd 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/ent/service/impl/EntServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/ent/service/impl/EntServiceImpl.java @@ -10,6 +10,7 @@ import kcc.kccadr.adjPgrMgr.ent.service.EntService; import kcc.kccadr.adjPgrMgr.ent.service.EntVO; import kcc.kccadr.adjreqmgr.service.AdjReqMgrVO; import kcc.kccadr.adjreqmgr.service.impl.AdjReqMgrDAO; +import kcc.kccadr.advc.service.impl.AdrHstryMgrDAO; import kcc.kccadr.cmm.KccadrConstants; import kcc.let.sym.ccm.cde.service.CmmnDetailCodeVO; import kcc.let.sym.ccm.cde.service.EgovCcmCmmnDetailCodeManageService; @@ -32,6 +33,10 @@ public class EntServiceImpl implements EntService{ @Resource(name = "CmmnDetailCodeManageService") private EgovCcmCmmnDetailCodeManageService cmmnDetailCodeManageService; + // 조정사건이력관리 DAO + @Resource(name = "adrHstryMgrDAO") + private AdrHstryMgrDAO adrHstryMgrDAO; + //조정 상태 이력 관리 공통 사용을 위한 서비스 선언 @Resource(name="AdjReqMgrDAO") private AdjReqMgrDAO adjReqMgrDAO; @@ -46,7 +51,10 @@ public class EntServiceImpl implements EntService{ return entDAO.selectEntInfo_2(entVO); } - public int updateEntApprYnInfo(EntVO entVO) throws Exception{ + public int updateEntApprYnInfo(EntVO entVO + , String p_code_desc + , String p_stat_cd + ) throws Exception{ if(KccadrConstants.ADR_CNCL_DROP_COMP.equals(entVO.getApprYn())){ // 조정사건이력업데이트 @@ -69,6 +77,18 @@ public class EntServiceImpl implements EntService{ try { adjReqMgrDAO.insertAdrHstry(adjReqMgrVO); // 이력 등록 + + //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 + //adr_hstry_mgr에 값 넣기 - 시작 + adrHstryMgrDAO.insert4Func(adjReqMgrVO.getAdrSeq() + //, "상태코드수정" + , p_code_desc + //, adjReqMgrVO.getStatCd() + , p_stat_cd + + , adjReqMgrVO.getFrstRegisterId() + , adjReqMgrVO.getLastUpdusrId()); + //adr_hstry_mgr에 값 넣기 - 끝 }catch(Exception ex) { ex.printStackTrace(); } diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/ent/web/EntController.java b/src/main/java/kcc/kccadr/adjPgrMgr/ent/web/EntController.java index e2ade85d..14dac7f3 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/ent/web/EntController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/ent/web/EntController.java @@ -30,6 +30,7 @@ import kcc.kccadr.adjPgrMgr.cmm.service.PgrCmmService; import kcc.kccadr.adjPgrMgr.cmm.service.PgrCmmVO; import kcc.kccadr.adjPgrMgr.dlvinfo.service.DlvinfoService; import kcc.kccadr.adjPgrMgr.dlvinfo.service.DlvinfoVO; +import kcc.kccadr.advc.service.AdrHstryMgrService; import kcc.kccadr.kccadrCom.service.KccadrMgrUdtService; import kcc.kccadr.ozSchd.web.OzSchdExportUtil; @@ -71,6 +72,10 @@ public class EntController { @Resource(name = "checkAdrProcessUtil") private CheckAdrProcessUtil checkAdrProcessUtil; + // 이력관리 + @Resource(name = "adrHstryMgrService") + private AdrHstryMgrService adrHstryMgrService; + // 실서버 개발서버 구분 private static String islocal; // /pdf/out/ @Value("#{globalSettings['Globals.prod.islocal']}") @@ -134,7 +139,12 @@ public class EntController { */ closeVO.setCloseDocTy("50"); // 50 취하종결통보서 - cmmService.insertCloseDoc(closeVO); + + //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 + cmmService.insertCloseDoc(closeVO + , "조정진행관리>>조정진행목록>조정진행상세>사건문서>취하종결등록" //String p_code_desc - CC199 + , "A340" //String p_stat_cd + ); /* @@ -194,7 +204,11 @@ public class EntController { ModelAndView modelAndView = new ModelAndView(); modelAndView.setViewName("jsonView"); - cmmService.updateCloseDoc(closeVO); + //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 + cmmService.updateCloseDoc(closeVO + , "조정진행관리>>조정진행목록>조정진행상세>사건문서>취하종결등록-수정" //String p_code_desc - CC199 + , "A350" //String p_stat_cd + ); modelAndView.addObject("result", "success"); @@ -220,7 +234,10 @@ public class EntController { ModelAndView modelAndView = new ModelAndView(); modelAndView.setViewName("jsonView"); - cmmService.deleteCloseDoc(closeVO); + cmmService.deleteCloseDoc(closeVO + , "조정진행관리>>조정진행목록>조정진행상세>사건문서>취하종결등록-삭제" //String p_code_desc - CC199 + , "A360" //String p_stat_cd + ); modelAndView.addObject("result", "success"); @@ -301,6 +318,16 @@ public class EntController { } + //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 + //adr_hstry_mgr에 값 넣기 - 시작 + adrHstryMgrService.insert4Func(result.getAdrSeq() + , "조정진행관리>>조정진행목록>조정진행상세>취하종결통보서상세>출력" //String p_code_desc - CC199 + , "V380" //String p_stat_cd + , result.getFrstRegisterId() + , result.getLastUpdusrId() + ); + //adr_hstry_mgr에 값 넣기 - 끝 + return "/kccadr/adjPgrMgr/ent/report/adrCncltbsReport"; }