From 6ee57b5701989dde80b0964704b65ec5ec2839db Mon Sep 17 00:00:00 2001 From: myname Date: Mon, 29 Aug 2022 13:45:35 +0900 Subject: [PATCH 01/12] =?UTF-8?q?2022-08-29=2013:45=20=EC=82=AC=EA=B1=B4?= =?UTF-8?q?=EC=B2=98=EB=A6=AC=20=EC=9D=B4=EB=A0=A5=EA=B4=80=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../awd/service/AdjstWithDrawService.java | 10 +++- .../impl/AdjstWithDrawServiceImpl.java | 48 +++++++++++++++++-- .../awd/web/AdjstWithDrawController.java | 22 +++++++-- .../adjPgrMgr/apm/web/ApmController.java | 21 ++++++-- .../adjPgrMgr/cmm/service/PgrCmmService.java | 15 ++++-- .../cmm/service/impl/PgrCmmServiceImpl.java | 26 ++++++++-- .../adjPgrMgr/drt/service/DrtService.java | 5 +- .../drt/service/impl/DrtServiceImpl.java | 5 +- .../adjPgrMgr/drt/web/DrtController.java | 7 ++- .../adjPgrMgr/ent/service/EntService.java | 5 +- .../ent/service/impl/EntServiceImpl.java | 22 ++++++++- .../adjPgrMgr/ent/web/EntController.java | 33 +++++++++++-- 12 files changed, 191 insertions(+), 28 deletions(-) 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"; } From 3b7f573da2423b1bda12eb36d527d326459f7264 Mon Sep 17 00:00:00 2001 From: myname Date: Mon, 5 Sep 2022 11:52:46 +0900 Subject: [PATCH 02/12] =?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(){ - - + From cae41c7830d0718aed51bfa0bd2ef90f69c13637 Mon Sep 17 00:00:00 2001 From: myname Date: Mon, 5 Sep 2022 17:33:33 +0900 Subject: [PATCH 03/12] =?UTF-8?q?2022-09-05=2017:33=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 | 4 ++++ .../adjPgrMgr/cfrm/web/CfrmController.java | 19 ++++++++++++++--- .../adjPgrMgr/crt/web/CrtController.java | 19 ++++++++++++++--- .../drtctr/web/DrtCtrController.java | 7 ++++++- .../adjPgrMgr/oad/web/OadController.java | 21 +++++++++++++++---- .../egovProps/globals.properties | 3 ++- 6 files changed, 61 insertions(+), 12 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 ed8eb4e3..cfe59c84 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/arm/web/ArmController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/arm/web/ArmController.java @@ -152,6 +152,8 @@ public class ArmController { */ closeVO.setCloseDocTy("30"); // 30 조정권고안 + + //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 cmmService.insertCloseDoc(closeVO , "조정진행관리>>조정진행목록>조정진행상세>사건문서>조정권고안-등록" //String p_code_desc - CC199 , "A460" //String p_stat_cd @@ -261,6 +263,7 @@ public class ArmController { ModelAndView modelAndView = new ModelAndView(); modelAndView.setViewName("jsonView"); + //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 cmmService.updateCloseDoc(closeVO , "조정진행관리>>조정진행목록>조정진행상세>사건문서>조정권고안-수정" //String p_code_desc - CC199 , "A470" //String p_stat_cd @@ -290,6 +293,7 @@ public class ArmController { ModelAndView modelAndView = new ModelAndView(); modelAndView.setViewName("jsonView"); + //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 cmmService.deleteCloseDoc(closeVO , "조정진행관리>>조정진행목록>조정진행상세>사건문서>조정권고안-삭제" //String p_code_desc - CC199 , "A480" //String p_stat_cd diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/cfrm/web/CfrmController.java b/src/main/java/kcc/kccadr/adjPgrMgr/cfrm/web/CfrmController.java index d7c41027..2a39b18c 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/cfrm/web/CfrmController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/cfrm/web/CfrmController.java @@ -101,7 +101,12 @@ public class CfrmController { closeVO.setLastUpdusrId(userId); closeVO.setCloseDocTy("80"); // 80 확정증명원 등록 - cmmService.insertCloseDoc(closeVO); + + //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 + cmmService.insertCloseDoc(closeVO + , "조정진행관리>>조정진행목록>조정진행상세>사건문서>확정증명원등록" //String p_code_desc - CC199 + , "A500" //String p_stat_cd + ); modelAndView.addObject("result", "success"); @@ -156,7 +161,11 @@ public class CfrmController { ModelAndView modelAndView = new ModelAndView(); modelAndView.setViewName("jsonView"); - cmmService.updateCloseDoc(closeVO); + //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 + cmmService.updateCloseDoc(closeVO + , "조정진행관리>>조정진행목록>조정진행상세>사건문서>확정증명원-수정" //String p_code_desc - CC199 + , "A510" //String p_stat_cd + ); modelAndView.addObject("result", "success"); @@ -179,7 +188,11 @@ public class CfrmController { ModelAndView modelAndView = new ModelAndView(); modelAndView.setViewName("jsonView"); - cmmService.deleteCloseDoc(closeVO); + //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 + cmmService.deleteCloseDoc(closeVO + , "조정진행관리>>조정진행목록>조정진행상세>사건문서>확정증명원-삭제" //String p_code_desc - CC199 + , "A520" //String p_stat_cd + ); modelAndView.addObject("result", "success"); diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/crt/web/CrtController.java b/src/main/java/kcc/kccadr/adjPgrMgr/crt/web/CrtController.java index 2a9b8f6c..e82ecc23 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/crt/web/CrtController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/crt/web/CrtController.java @@ -136,7 +136,12 @@ public class CrtController { */ closeVO.setCloseDocTy("70"); // 70 불성립종결통보서 - cmmService.insertCloseDoc(closeVO); + + //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 + cmmService.insertCloseDoc(closeVO + , "조정진행관리>>조정진행목록>조정진행상세>사건문서>불성립종결통보서등록" //String p_code_desc - CC199 + , "A550" //String p_stat_cd + ); /* @@ -199,7 +204,11 @@ public class CrtController { ModelAndView modelAndView = new ModelAndView(); modelAndView.setViewName("jsonView"); - cmmService.updateCloseDoc(closeVO); + //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 + cmmService.updateCloseDoc(closeVO + , "조정진행관리>>조정진행목록>조정진행상세>사건문서>불성립종결통보서-수정" //String p_code_desc - CC199 + , "A560" //String p_stat_cd + ); modelAndView.addObject("result", "success"); @@ -225,7 +234,11 @@ public class CrtController { ModelAndView modelAndView = new ModelAndView(); modelAndView.setViewName("jsonView"); - cmmService.deleteCloseDoc(closeVO); + //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 + cmmService.deleteCloseDoc(closeVO + , "조정진행관리>>조정진행목록>조정진행상세>사건문서>불성립종결통보서-삭제" //String p_code_desc - CC199 + , "A570" //String p_stat_cd + ); modelAndView.addObject("result", "success"); diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/drtctr/web/DrtCtrController.java b/src/main/java/kcc/kccadr/adjPgrMgr/drtctr/web/DrtCtrController.java index db47a4eb..dc4cf34f 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/drtctr/web/DrtCtrController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/drtctr/web/DrtCtrController.java @@ -203,7 +203,12 @@ public class DrtCtrController { closeVO.setCloseCn1(drtCtrVO.getCtrCn()); closeVO.setFrstRegisterId(userId); closeVO.setLastUpdusrId(userId); - cmmService.insertCloseDoc(closeVO); + + //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 + cmmService.insertCloseDoc(closeVO + , "조정진행관리>>조정진행목록>조정진행상세>사건문서>조정조서등록" //String p_code_desc - CC199 + , "A650" //String p_stat_cd + ); /* AdjReqMgrVO arv = new AdjReqMgrVO(); diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/oad/web/OadController.java b/src/main/java/kcc/kccadr/adjPgrMgr/oad/web/OadController.java index eab395da..ff22a506 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/oad/web/OadController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/oad/web/OadController.java @@ -145,7 +145,12 @@ public class OadController { */ closeVO.setCloseDocTy("60"); // 60 직권조정결정서 - cmmService.insertCloseDoc(closeVO); + + //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 + cmmService.insertCloseDoc(closeVO + , "조정진행관리>>조정진행목록>조정진행상세>사건문서>직권조정결정서등록" //String p_code_desc - CC199 + , "A600" //String p_stat_cd + ); /* @@ -291,7 +296,11 @@ public class OadController { ModelAndView modelAndView = new ModelAndView(); modelAndView.setViewName("jsonView"); - cmmService.updateCloseDoc(closeVO); + //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 + cmmService.updateCloseDoc(closeVO + , "조정진행관리>>조정진행목록>조정진행상세>사건문서>직권조정결정서-수정" //String p_code_desc - CC199 + , "A610" //String p_stat_cd + ); modelAndView.addObject("result", "success"); @@ -316,8 +325,12 @@ public class OadController { ModelAndView modelAndView = new ModelAndView(); modelAndView.setViewName("jsonView"); - - cmmService.deleteCloseDoc(closeVO); + + //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 + cmmService.deleteCloseDoc(closeVO + , "조정진행관리>>조정진행목록>조정진행상세>사건문서>직권조정결정서-삭제" //String p_code_desc - CC199 + , "A620" //String p_stat_cd + ); modelAndView.addObject("result", "success"); diff --git a/src/main/resources/egovframework/egovProps/globals.properties b/src/main/resources/egovframework/egovProps/globals.properties index caeee14c..67a3cbe3 100644 --- a/src/main/resources/egovframework/egovProps/globals.properties +++ b/src/main/resources/egovframework/egovProps/globals.properties @@ -33,7 +33,8 @@ Globals.DriverClassName=cubrid.jdbc.driver.CUBRIDDriver #\ud074\ub77c\uc6b0\ub4dc \uc11c\ubc84 #Globals.Url=jdbc:cubrid:158.247.225.133:30000:kcc_adrs4:::?charset=utf8 #\uac1c\ubc1c\uc11c\ubc84 -Globals.Url=jdbc:cubrid:192.168.0.176:30000:cubdb:::?charset=utf8 +#Globals.Url=jdbc:cubrid:192.168.0.176:30000:cubdb:::?charset=utf8 +Globals.Url=jdbc:cubrid:192.168.0.176:30000:kcc_adr_advc:::?charset=utf8 #\uc2e4\uc11c\ubc84 #Globals.Url=jdbc:cubrid:192.168.39.14:30000:kcc_adrs4:::?charset=utf8 From 0d13a22ad645be59494a233a3031a3227ea87e54 Mon Sep 17 00:00:00 2001 From: hylee Date: Thu, 8 Sep 2022 12:50:16 +0900 Subject: [PATCH 04/12] =?UTF-8?q?refactor:=20=EC=B2=B4=ED=97=98=ED=95=98?= =?UTF-8?q?=EA=B8=B0=20=EC=83=81=EC=84=B8=20=ED=95=98=EC=9C=84=20=EB=B2=84?= =?UTF-8?q?=ED=8A=BC=20=EC=A7=84=ED=96=89=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/AdjstExpDetailController.java | 15 +- .../kccadr/adjstExp/adjstReqRegistStep3.jsp | 2 +- .../adjstExpDetail/adjstReqStatusDetail.jsp | 4 +- .../adjstReqStatusTabDetail.jsp | 20 +- .../adjstReqStatusTabNormal.jsp | 364 ++++++++++++++++++ .../adjstReqStatusTabStatus.jsp | 101 +++++ .../kccadr/adjstExpDetail/expAnsSubmit.jsp | 155 +++----- 7 files changed, 557 insertions(+), 104 deletions(-) create mode 100644 src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstReqStatusTabNormal.jsp create mode 100644 src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstReqStatusTabStatus.jsp diff --git a/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpDetailController.java b/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpDetailController.java index e01999cd..43e52191 100644 --- a/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpDetailController.java +++ b/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpDetailController.java @@ -139,6 +139,20 @@ public class AdjstExpDetailController { model.addAttribute("resInfo" , resInfo); return "/web/kccadr/adjstExpDetail/adjstReqStatusTabDetail"; } + /** + * 조정진행 상세 Tab 사건진행 화면 + */ + @RequestMapping("/web/kccadr/adjstExpDetail/tab/adjstReqStatusTabStatus.do") + public String adjstReqStatusTabStatus() throws Exception { + return "/web/kccadr/adjstExpDetail/adjstReqStatusTabStatus"; + } + /** + * 조정진행 상세 Tab 조정기록 화면 + */ + @RequestMapping("/web/kccadr/adjstExpDetail/tab/adjstReqStatusTabNormal.do") + public String adjstReqStatusTabNormal() throws Exception { + return "/web/kccadr/adjstExpDetail/adjstReqStatusTabNormal"; + } /** * 조정신청 구분선택 - 안내화면 @@ -164,7 +178,6 @@ public class AdjstExpDetailController { - 직권조정 결정서 상세 */ - System.out.println("adjstReqStatusVO.getExpCode() : "+ adjstReqStatusVO.getExpCode()); switch (adjstReqStatusVO.getExpCode()) { case "01": returnUrl += "expAnsSubmit"; diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstReqRegistStep3.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstReqRegistStep3.jsp index 5c709000..8c702386 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstReqRegistStep3.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstReqRegistStep3.jsp @@ -234,7 +234,7 @@ function fn_adjstReq_preview() {
-
+
diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstReqStatusDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstReqStatusDetail.jsp index f2de83a4..fac9f1d8 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstReqStatusDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstReqStatusDetail.jsp @@ -34,8 +34,8 @@ } function getPageUrl(idx){ switch (idx) { - case 1 : return '/web/kccadr/accdnt/ars/tab/adjstReqStatusTabNormal.do'; - case 2 : return '/web/kccadr/accdnt/ars/tab/adjstReqStatusTabStatus.do'; + case 1 : return '/web/kccadr/adjstExpDetail/tab/adjstReqStatusTabNormal.do'; + case 2 : return '/web/kccadr/adjstExpDetail/tab/adjstReqStatusTabStatus.do'; default: return '/web/kccadr/adjstExpDetail/tab/adjstReqStatusTabDetail.do'; } } diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstReqStatusTabDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstReqStatusTabDetail.jsp index da2d08f8..7c493e3d 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstReqStatusTabDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstReqStatusTabDetail.jsp @@ -15,7 +15,6 @@ function fncGoNextPage(){ - var pageForm = document.pageForm; var index = Number($('#pageExpIndex').val())+1; $('#pageExpIndex').val(index); tabPageLoad(0); @@ -86,6 +85,14 @@ } }); + $('.step').click(function(){ + + var pageExpIndex = $(this).data('info'); + $('#pageExpIndex').val(pageExpIndex); + tabPageLoad(0); + + }); + //접수증 팝업 function fn_adjstReq_receipt_report() { window.open(""); @@ -143,7 +150,7 @@ resInfo--%>
-
"> +
" data-info="1" style="cursor:pointer;">

STEP. 01 @@ -151,7 +158,7 @@ resInfo--%>

다음
-
"> +
" data-info="2" style="cursor:pointer;">

STEP. 02 @@ -159,7 +166,7 @@ resInfo--%>

다음
-
"> +
" data-info="3" style="cursor:pointer;">

STEP. 03 @@ -167,7 +174,7 @@ resInfo--%>

다음
-
"> +
" data-info="4" style="cursor:pointer;">

STEP. 04 @@ -175,7 +182,7 @@ resInfo--%>

다음
-
"> +
" data-info="5" style="cursor:pointer;">

STEP. 05 @@ -323,7 +330,6 @@ resInfo--%> - diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstReqStatusTabNormal.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstReqStatusTabNormal.jsp new file mode 100644 index 00000000..07b1127a --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstReqStatusTabNormal.jsp @@ -0,0 +1,364 @@ +<%@ page contentType="text/html; charset=utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> + + + + +조정진행 + + + + + + + + +

+ +
+ + + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
조정진행 상세 - 조정기록 : 일자, 등록인, 문건명, 상대방 공개여부 등 정보제공
일자등록인문건명상대방 공개여부
+

+ +

+
+

2022-09-23

+
+

체험인

+
[체험]조정신청서 +

+ 공개 +

+
+

+ +

+
+

2022-10-30

+
+

체험인

+
[체험]메인비주얼.jpg +

공개

+
+

+ +

+
+

2022-11-24

+
+

체험인

+
[체험]체험 테스트 파일.hwp +

비공개

+
+
+
+
+
+
+ + + +
+
+ + diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstReqStatusTabStatus.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstReqStatusTabStatus.jsp new file mode 100644 index 00000000..b2ef9871 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstReqStatusTabStatus.jsp @@ -0,0 +1,101 @@ +<%@ page contentType="text/html; charset=utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> + + + + +조정진행 + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
조정진행 상세 - 사건진행 : 일자, 진행현황, 비고 등 정보제공
일자진행현황비고
+

2022-01-01

+
+ [체험] 조정접수 +
+

2022-02-05

+
+ [체험] 신청인 홍길동 답변서 제출 +
+

2022-04-07

+
+ [체험] 접수 결재 완료 +
+
+
+
+
+ <%-- --%> + + + <%-- --%> +
+
+
+ +
+
+ + diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/expAnsSubmit.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/expAnsSubmit.jsp index 480f43a0..1157d884 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/expAnsSubmit.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/expAnsSubmit.jsp @@ -23,100 +23,63 @@ $(document).ready(function(){ // $(':input').attr("disabled"); }); -// $(function() { + $(function() { -// $('#filebutton').click(function(e) { + $('#filebutton').click(function(e) { -// e.preventDefault(); + e.preventDefault(); -// $('#file_temp').click(); + $('#file_temp').click(); -// }); + }); -// }); + }); -// function fncReg() { -// var f = document.getElementById("listForm"); -// var data = new FormData(f); -// _fileForm2.forEach(function(obj, idx) { -// if (obj) -// data.append("file" + idx, obj.fileObj); -// }); + function fncReg() { + alert("체험 기능입니다.") + } -// if (validation()) { -// if(confirm("답변서를 등록 하시겠습니까?")){ - -// $.ajax({ -// type : "POST", -// enctype : 'multipart/form-data', -// url : "/web/kccadr/accdnt/ans/ansSubmitAjax.do", -// data : data, -// dataType : 'json', -// async : false, -// processData : false, -// contentType : false, -// cache : false, -// success : function(returnData, status) { -// if (returnData.result == 'success') { -// alert("답변서 제출이 완료되었습니다."); -// listPage(); -// } else { -// alert(returnData.message); -// } + function validation() { + + // $('#adrDocCn1').val( $('#rpplEmail01').val()+'@'+$('#rpplEmail02').val() ); + // $('#rpplPhone').val( $('#rpplPhone01').val()+'-'+$('#rpplPhone02').val()+'-'+$('#rpplPhone03').val() ); + if (isEmpty($('#adrDocCn1').val())) { + alert('답변내용을 입력해 주세요.'); + return false; + } + + if (isEmpty($('#adrDocTy').val())) { + alert('문건명을 선택해주세요.'); + return false; + } + + if ($('#tbody_fiielist tr').length * 1 <= 0) { + alert("첨부서류를 등록해 주세요"); + return false; + + } + return true; + } + + function fncGoList() { + var varFrom = document.getElementById("listForm"); + varFrom.action = ""; + varFrom.submit(); + } + + function notiOpenYn() { + if (confirm('제한공개는 영업비밀 등에 해당하는 경우만 선택해 주십시요.' + '\n공정한 진행을 위해 위원회 판단으로 공개로 전환될 수 있습니다.' + '\n제한공개로 선택 하시겠습니까?')) { + $("#openYn_N").prop('checked', true); + } else { + $("#openYn_Y").prop('checked', true); + } + + } -// }, -// error : function(e) { -// alert("답변서 제출에 실패하였습니다."); -// console.log("ERROR : ", e); -// } -// }); -// } - -// } - -// } - -// function validation() { - -// // $('#adrDocCn1').val( $('#rpplEmail01').val()+'@'+$('#rpplEmail02').val() ); -// // $('#rpplPhone').val( $('#rpplPhone01').val()+'-'+$('#rpplPhone02').val()+'-'+$('#rpplPhone03').val() ); -// if (isEmpty($('#adrDocCn1').val())) { -// alert('답변내용을 입력해 주세요.'); -// return false; -// } - -// if (isEmpty($('#adrDocTy').val())) { -// alert('문건명을 선택해주세요.'); -// return false; -// } - -// if ($('#tbody_fiielist tr').length * 1 <= 0) { -// alert("첨부서류를 등록해 주세요"); -// return false; - -// } -// return true; -// } - -// function fncGoList() { -// var varFrom = document.getElementById("listForm"); -// varFrom.action = ""; -// varFrom.submit(); -// } - -// function notiOpenYn() { -// if (confirm('제한공개는 영업비밀 등에 해당하는 경우만 선택해 주십시요.' + '\n공정한 진행을 위해 위원회 판단으로 공개로 전환될 수 있습니다.' + '\n제한공개로 선택 하시겠습니까?')) { -// $("#openYn_N").prop('checked', true); -// } else { -// $("#openYn_Y").prop('checked', true); -// } - -// } - -// function listPage(){ -// //location.href=""; -// fncGoList(); -// } + function listPage(){ + //location.href=""; + fncGoList(); + } @@ -126,6 +89,11 @@ $(document).ready(function(){ + + +   +   +  
@@ -172,7 +140,7 @@ $(document).ready(function(){

- + 조정

@@ -183,7 +151,7 @@ $(document).ready(function(){

- + 체험 조정부

@@ -193,7 +161,7 @@ $(document).ready(function(){

- + 체험자

@@ -203,7 +171,7 @@ $(document).ready(function(){

- + 피체험자

@@ -223,7 +191,8 @@ $(document).ready(function(){

필수입력 항목*

답변내용

- + + @@ -361,8 +330,8 @@ $(document).ready(function(){
- - + +
From dc328297bc2bc8f41723c248344666d1745779a5 Mon Sep 17 00:00:00 2001 From: hylee Date: Sun, 11 Sep 2022 14:24:47 +0900 Subject: [PATCH 05/12] =?UTF-8?q?feat:=EC=B2=B4=ED=97=98=ED=95=98=EA=B8=B0?= =?UTF-8?q?=20=EC=A7=84=ED=96=89=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../accdnt/adr/service/AdjstDeputyReqVO.java | 9 + .../web/AdjstExpDetailController.java | 25 +- .../kccadr/accdnt/adr/adjstDeputyReqList.jsp | 2 +- .../accdnt/ars/tab/docIssReqViewPop.jsp | 6 +- .../adjstExp/adjstReqRegistInformation.jsp | 3 + .../kccadr/adjstExp/adjstReqRegistStep3.jsp | 2 +- .../adjstExpDetail/adjstDeputyReqCreate.jsp | 420 ++++++++++++++++++ .../adjstReqStatusTabDetail.jsp | 7 - .../adjstReqStatusTabStatus.jsp | 8 +- .../adjstExpDetail/docIssReqViewPop.jsp | 134 ++++++ .../adjstExpDetail/expAdjstDeputyReqList.jsp | 34 +- .../kccadr/kccadrCom/kccadrConstantsJsp.jsp | 9 +- 12 files changed, 619 insertions(+), 40 deletions(-) create mode 100644 src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstDeputyReqCreate.jsp create mode 100644 src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/docIssReqViewPop.jsp diff --git a/src/main/java/kcc/kccadr/accdnt/adr/service/AdjstDeputyReqVO.java b/src/main/java/kcc/kccadr/accdnt/adr/service/AdjstDeputyReqVO.java index b33e99a6..0e795c2e 100644 --- a/src/main/java/kcc/kccadr/accdnt/adr/service/AdjstDeputyReqVO.java +++ b/src/main/java/kcc/kccadr/accdnt/adr/service/AdjstDeputyReqVO.java @@ -78,6 +78,7 @@ public class AdjstDeputyReqVO extends ComDefaultVO implements Serializable { private String resPonDentNms; private String ccTy; private String rejectCn; + private String expCode; public int getRowNumber() { return rowNumber; @@ -390,5 +391,13 @@ public class AdjstDeputyReqVO extends ComDefaultVO implements Serializable { public void setRejectCn(String rejectCn) { this.rejectCn = rejectCn; } + + public String getExpCode() { + return expCode; + } + + public void setExpCode(String expCode) { + this.expCode = expCode; + } } diff --git a/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpDetailController.java b/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpDetailController.java index 43e52191..7c85421d 100644 --- a/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpDetailController.java +++ b/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpDetailController.java @@ -29,9 +29,11 @@ import kcc.com.cmm.service.EgovFileMngService; import kcc.com.cmm.service.FileVO; import kcc.com.cmm.util.StringUtil; import kcc.com.utl.fcc.service.EgovStringUtil; +import kcc.kccadr.accdnt.adr.service.AdjstDeputyReqVO; import kcc.kccadr.accdnt.ai.service.AdjstIncidentVO; import kcc.kccadr.accdnt.ars.service.AdjstReqStatusVO; import kcc.kccadr.accdnt.crtfc.service.CrtfcService; +import kcc.kccadr.adjclsmgr.service.AdjClsMgrVO; import kcc.kccadr.adjst.service.AdjstReqService; import kcc.kccadr.adjst.service.AdjstReqVO; import kcc.kccadr.adjstExp.service.AdjstExpService; @@ -158,7 +160,7 @@ public class AdjstExpDetailController { * 조정신청 구분선택 - 안내화면 */ @RequestMapping("/web/kccadr/adjstExpDetail/popup/openExpExamplePop.do") - public String adjstReqOpenAnswerExamplePop(@ModelAttribute("adjstReqStatusVO") AdjstReqStatusVO adjstReqStatusVO, ModelMap model) throws Exception { + public String adjstReqOpenAnswerExamplePop(@ModelAttribute("adjDeputyReqVO") AdjstDeputyReqVO adjDeputyReqVO, ModelMap model) throws Exception { String returnUrl = "/web/kccadr/adjstExpDetail/"; @@ -179,7 +181,7 @@ public class AdjstExpDetailController { */ - switch (adjstReqStatusVO.getExpCode()) { + switch (adjDeputyReqVO.getExpCode()) { case "01": returnUrl += "expAnsSubmit"; break; case "02": returnUrl += "expAdjstDeputyReqList"; @@ -187,14 +189,27 @@ public class AdjstExpDetailController { default: returnUrl += "expAnsSubmit"; break; } - System.out.println("returnUrl : "+ returnUrl); - - return returnUrl; } + + // 기록열람, 조정조서 발급 요청 팝업 + @RequestMapping(value = "/web/kccadr/adjstExpDetail/popup/docIssReqViewPop.do") + public String docIssReqViewPop(@ModelAttribute("adjClsMgrVO") AdjClsMgrVO adjClsMgrVO, ModelMap model) throws Exception { +// model.addAttribute("security", adjReqMgrService.selectAdjstReqSecurityInfo(param)); + return "/web/kccadr/adjstExpDetail/docIssReqViewPop"; + } + + /** + * 조정대리신청 화면 + */ + @RequestMapping("/web/kccadr/adjstExpDetail/popup/adjstDeputyReqCreate.do") + public String adjstDeputyReqCreate(@ModelAttribute("adjDeputyReqVO") AdjstDeputyReqVO adjDeputyReqVO, ModelMap model) throws Exception { + return "/web/kccadr/adjstExpDetail/adjstDeputyReqCreate"; + } + diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/adr/adjstDeputyReqList.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/adr/adjstDeputyReqList.jsp index be288f52..a62ba4a2 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/adr/adjstDeputyReqList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/adr/adjstDeputyReqList.jsp @@ -13,7 +13,7 @@ + + + + + + + + + + + + + + + + +
+ + + + + +
+ + + + + + + + + +
+
+
+

조정대리신청

+
+ + + + + +
+
+

조정대리 정보

+ <%----%> +
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
조정대리 정보 : 이름, 생년월일, 주소, 자택(사무소), 휴대전화등의 정보 입력
+

필수입력 항목*

+

이름

+
+ + +

필수입력 항목*

+

생년월일

+
+ +
+

필수입력 항목*

+

주소

+
+ + + +
+ + + + +
+ +
+

필수입력 항목*

+

자택(사무소)

+
+ + + +

필수입력 항목*

+

휴대전화

+
+ + +
+
+ +
+ + + + + + + + + + + + + + + + + + + + +
위임인과의 관계, 첨부서류, 조정위임 사항등의 정보 입력
+

필수입력 항목*

+

위임인과의 관계

+
+
+ checked > + + checked > + + checked> + +
+
+

필수입력 항목*

+

첨부서류

+
+ + + + +
+ + + + + + + + + + + + + + + + + + + + +
첨부파일 리스트 : 파일명, 종류, 크기, 삭제
파일 명종류크기삭제
+

첨부하실 파일을 마우스로 끌어서 넣어주세요.

+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
첨부파일 리스트 : 파일명, 종류, 크기, 삭제
파일 명종류크기삭제
+ ${fileList.orignlFileNm} + + "> + + "> + + +
+
+
+

필수입력 항목*

+

조정위임 사항

+
+

+ 1. 저작권 분쟁조정에 관한 일체의 조정행위 및 합의 행위
+ 2. 조정의 취하
+ 3. 기타 +

+
+
+ +
+
+
+ + + + + + + + + +
+
+ +
+
+ +
+ + diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstReqStatusTabDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstReqStatusTabDetail.jsp index 7c493e3d..a25d39ca 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstReqStatusTabDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstReqStatusTabDetail.jsp @@ -217,17 +217,10 @@ resInfo--%>

- <%-- -

주소

- - -

()

- --%>

신청인 분류

-<%--

--%>

diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstReqStatusTabStatus.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstReqStatusTabStatus.jsp index b2ef9871..370911d6 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstReqStatusTabStatus.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstReqStatusTabStatus.jsp @@ -18,7 +18,7 @@ //function fncSecurityPop2(adrSeq,edtTy,edtSn) { function fncSecurityPop2(docuReqCd) { commonPopLayeropen( - "/web/kccadr/accdnt/ars/tab/docIssReqViewPop.do" + "/web/kccadr/adjstExpDetail/popup/docIssReqViewPop.do" , 800 , 600 , {docuReqCd : docuReqCd, adrSeq : $("#adrSeq").val()} @@ -86,15 +86,15 @@ $(document).ready(function() {
-
+ <%-- --%> <%-- --%> -
+
- +
diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/docIssReqViewPop.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/docIssReqViewPop.jsp new file mode 100644 index 00000000..2d18f30f --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/docIssReqViewPop.jsp @@ -0,0 +1,134 @@ +<%@ page contentType="text/html; charset=utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> + + + + +조정신청 보완/수정요청 + + + + + + + + + + + + + + diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/expAdjstDeputyReqList.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/expAdjstDeputyReqList.jsp index 6af5aa80..ca90a6ad 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/expAdjstDeputyReqList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/expAdjstDeputyReqList.jsp @@ -11,21 +11,19 @@ 조정대리신청 목록 + @@ -35,11 +33,11 @@ -<%-- --%> -<%-- --%> -<%-- --%> -<%-- --%> -<%-- --%> + + + + +
@@ -96,8 +94,8 @@
- - + +
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 cc708993..47d228f2 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 @@ -816,9 +816,14 @@ var AdjstReq = { return false; } + if($(".uploaded_obj").length <= 0 ) { - alert("파일첨부는 필수입력입니다."); - return false; + if(this.STEP == "${KccadrConstants.STEP9}"){ + alert("조정신청에서 첨부파일은 필수입력입니다."); + }else{ + alert("파일첨부는 필수입력입니다."); + return false; + } } return true; From d873d265de6b839cc0fff1034b6149a3e366b83a Mon Sep 17 00:00:00 2001 From: hylee Date: Mon, 12 Sep 2022 12:15:21 +0900 Subject: [PATCH 06/12] =?UTF-8?q?feat:=EC=B2=B4=ED=97=98=EA=B8=B0=EB=8A=A5?= =?UTF-8?q?=20=EC=A2=85=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adjstExp/service/AdjstExpService.java | 4 + .../adjstExp/service/impl/AdjstExpDAO.java | 7 +- .../service/impl/AdjstExpServiceImpl.java | 94 ++++ .../web/AdjstExpDetailController.java | 34 +- .../kccadr/adjstExp/AdjstExp_SQL_Mysql.xml | 23 +- .../adjstExpDetail/adjstReqStatusDetail.jsp | 2 +- .../adjstReqStatusTabDetail.jsp | 42 +- .../expAdjstChangeDateCreate.jsp | 512 ++++++++++++++++++ ...Create.jsp => expAdjstDeputyReqCreate.jsp} | 102 +++- .../adjstExpDetail/expAdjstDeputyReqList.jsp | 2 + .../adjstExpDetail/expAdjstWithDrawCreate.jsp | 279 ++++++++++ .../kccadr/adjstExpDetail/expCorReqCreate.jsp | 438 +++++++++++++++ .../kccadr/adjstExpDetail/expOadDetail.jsp | 47 +- .../kccadr/adjstExpDetail/expOjctRegist.jsp | 281 ++++++++++ 14 files changed, 1813 insertions(+), 54 deletions(-) create mode 100644 src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/expAdjstChangeDateCreate.jsp rename src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/{adjstDeputyReqCreate.jsp => expAdjstDeputyReqCreate.jsp} (86%) create mode 100644 src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/expAdjstWithDrawCreate.jsp create mode 100644 src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/expCorReqCreate.jsp create mode 100644 src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/expOjctRegist.jsp diff --git a/src/main/java/kcc/kccadr/adjstExp/service/AdjstExpService.java b/src/main/java/kcc/kccadr/adjstExp/service/AdjstExpService.java index 5fe81d6b..81e37184 100644 --- a/src/main/java/kcc/kccadr/adjstExp/service/AdjstExpService.java +++ b/src/main/java/kcc/kccadr/adjstExp/service/AdjstExpService.java @@ -4,7 +4,9 @@ import java.util.List; import org.springframework.web.multipart.MultipartHttpServletRequest; +import kcc.kccadr.accdnt.adr.service.AdjstDeputyReqVO; import kcc.kccadr.accdnt.ai.service.AdjstIncidentVO; +import kcc.kccadr.accdnt.arc.service.CorReqVO; import kcc.kccadr.accdnt.ars.service.AdjstReqStatusVO; import kcc.kccadr.adjst.service.AdjstReqVO; import kcc.kccadr.cmm.RestResponse; @@ -59,6 +61,8 @@ public interface AdjstExpService { List selectAdjstReqRpplInfo(AdjstReqStatusVO adjstReqStatusVO) throws Exception; AdjstIncidentVO selectAdjstIncidentMaster(AdjstIncidentVO adjstIncidentVO) throws Exception; + + List selectRpplList(AdjstDeputyReqVO adjDeputyReqVO); diff --git a/src/main/java/kcc/kccadr/adjstExp/service/impl/AdjstExpDAO.java b/src/main/java/kcc/kccadr/adjstExp/service/impl/AdjstExpDAO.java index 933cfec6..f99467c9 100644 --- a/src/main/java/kcc/kccadr/adjstExp/service/impl/AdjstExpDAO.java +++ b/src/main/java/kcc/kccadr/adjstExp/service/impl/AdjstExpDAO.java @@ -5,7 +5,9 @@ import java.util.List; import org.springframework.stereotype.Repository; import egovframework.rte.psl.dataaccess.EgovAbstractDAO; +import kcc.kccadr.accdnt.adr.service.AdjstDeputyReqVO; import kcc.kccadr.accdnt.ai.service.AdjstIncidentVO; +import kcc.kccadr.accdnt.arc.service.CorReqVO; import kcc.kccadr.accdnt.ars.service.AdjstReqStatusVO; import kcc.kccadr.adjst.service.AdjstReqVO; @@ -103,7 +105,10 @@ public class AdjstExpDAO extends EgovAbstractDAO { public AdjstIncidentVO selectAdjstIncidentMaster(AdjstIncidentVO adjstIncidentVO) throws Exception { return (AdjstIncidentVO) select("adjstExpDAO.selectAdjstIncidentMaster", adjstIncidentVO); } - + + public List selectRpplList(AdjstDeputyReqVO adjDeputyReqVO) { + return (List) list("adjstExpDAO.selectRpplList", adjDeputyReqVO); + } // public AdjstIncidentVO selectApmChgDateInfo(AdjstIncidentVO adjstIncidentVO) throws Exception{ // return (AdjstIncidentVO) select("adjstExpDAO.selectApmChgDateInfo", adjstIncidentVO); // } diff --git a/src/main/java/kcc/kccadr/adjstExp/service/impl/AdjstExpServiceImpl.java b/src/main/java/kcc/kccadr/adjstExp/service/impl/AdjstExpServiceImpl.java index 17e28060..74b9b0b6 100644 --- a/src/main/java/kcc/kccadr/adjstExp/service/impl/AdjstExpServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjstExp/service/impl/AdjstExpServiceImpl.java @@ -23,8 +23,11 @@ import kcc.com.cmm.service.CmmnDetailCode; import kcc.com.cmm.service.EgovFileMngService; import kcc.com.cmm.service.EgovFileMngUtil; import kcc.com.cmm.service.FileVO; +import kcc.com.cmm.util.StringUtil; import kcc.com.utl.user.service.CheckAdrProcessUtil; +import kcc.kccadr.accdnt.adr.service.AdjstDeputyReqVO; import kcc.kccadr.accdnt.ai.service.AdjstIncidentVO; +import kcc.kccadr.accdnt.arc.service.CorReqVO; import kcc.kccadr.accdnt.ars.service.AdjstReqStatusVO; import kcc.kccadr.adjreqmgr.service.AdjReqMgrVO; import kcc.kccadr.adjreqmgr.service.impl.AdjReqMgrDAO; @@ -480,4 +483,95 @@ public class AdjstExpServiceImpl extends EgovAbstractServiceImpl implements Adj //디비에 수정해 주기 adjstExpDAO.mergeIntoAdrRppl(adjstReqVO); } + + + + @Override + public List selectRpplList(AdjstDeputyReqVO adjDeputyReqVO) { + List list = adjstExpDAO.selectRpplList(adjDeputyReqVO); + for (CorReqVO item : list) { + decpyptVo(item); + } + return list; + } + + /** + * 신청인, 피신청인 복호화 + * + * @param result + */ + private void decpyptVo(CorReqVO result) { + + if (result != null) { + StringBuffer key = new StringBuffer(result.getRpplSeq()); + if (!StringUtil.isEmpty(result.getRpplNm())) { + result.setRpplNm(egovCryptoUtil.decrypt(result.getRpplNm())); + key.append("|" + result.getRpplNm()); + } + + //조정신청 신청인 이름 + if (!StringUtil.isEmpty(result.getAppliCantNm())) { + result.setAppliCantNm(egovCryptoUtil.decrypt(result.getAppliCantNm())); + key.append("|" + result.getAppliCantNm()); + } + + if (!StringUtil.isEmpty(result.getRpplPost())) { + result.setRpplPost(egovCryptoUtil.decrypt(result.getRpplPost())); + key.append("|" + result.getRpplPost()); + } + if (!StringUtil.isEmpty(result.getRpplAddr())) { + result.setRpplAddr(egovCryptoUtil.decrypt(result.getRpplAddr())); + key.append("|" + result.getRpplAddr()); + } + if (!StringUtil.isEmpty(result.getRpplAddrDtl())) { + result.setRpplAddrDtl(egovCryptoUtil.decrypt(result.getRpplAddrDtl())); + key.append("|" + result.getRpplAddrDtl()); + } + if (!StringUtil.isEmpty(result.getRpplPhone())) { + result.setRpplPhone(egovCryptoUtil.decrypt(result.getRpplPhone())); + if(!result.getRpplPhone().contains("-")) { + StringBuffer buff = new StringBuffer(); + buff.append(result.getRpplPhone()); + buff.insert(3, "-"); + buff.insert(8, "-"); + result.setRpplPhone(buff.toString()); + } + String phone[] = result.getRpplPhone().split("-"); + + result.setRpplPhone01(phone[0]); + result.setRpplPhone02(phone[1]); + result.setRpplPhone03(phone[2]); + key.append("|" + result.getRpplPhone()); + } + if (!StringUtil.isEmpty(result.getRpplEmail())) { + result.setRpplEmail(egovCryptoUtil.decrypt(result.getRpplEmail())); + String email[] = result.getRpplEmail().split("@"); + result.setRpplEmail01(email[0]); + result.setRpplEmail02(email[1]); + key.append("|" + result.getRpplEmail()); + } + + if (!StringUtil.isEmpty(result.getOldRpplNm())) { + result.setOldRpplNm(egovCryptoUtil.decrypt(result.getOldRpplNm())); + } + if (!StringUtil.isEmpty(result.getOldRpplPost())) { + result.setOldRpplPost(egovCryptoUtil.decrypt(result.getOldRpplPost())); + } + if (!StringUtil.isEmpty(result.getOldRpplAddr())) { + result.setOldRpplAddr(egovCryptoUtil.decrypt(result.getOldRpplAddr())); + } + if (!StringUtil.isEmpty(result.getOldRpplAddrDtl())) { + result.setOldRpplAddrDtl(egovCryptoUtil.decrypt(result.getOldRpplAddrDtl())); + } + if (!StringUtil.isEmpty(result.getOldRpplPhone())) { + result.setOldRpplPhone(egovCryptoUtil.decrypt(result.getOldRpplPhone())); + } + if (!StringUtil.isEmpty(result.getOldRpplEmail())) { + result.setOldRpplEmail(egovCryptoUtil.decrypt(result.getOldRpplEmail())); + } + + result.setSelectRpplKey(key.toString()); + } + } + } diff --git a/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpDetailController.java b/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpDetailController.java index 7c85421d..996a3811 100644 --- a/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpDetailController.java +++ b/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpDetailController.java @@ -29,6 +29,7 @@ import kcc.com.cmm.service.EgovFileMngService; import kcc.com.cmm.service.FileVO; import kcc.com.cmm.util.StringUtil; import kcc.com.utl.fcc.service.EgovStringUtil; +import kcc.kccadr.accdnt.acd.service.AdjstChangeDateVO; import kcc.kccadr.accdnt.adr.service.AdjstDeputyReqVO; import kcc.kccadr.accdnt.ai.service.AdjstIncidentVO; import kcc.kccadr.accdnt.ars.service.AdjstReqStatusVO; @@ -169,27 +170,44 @@ public class AdjstExpDetailController { - 답변서 제출 - 01 기일지정 - 조정 대리인 신청 - 02 - - 기일변경 요청 - - 조정 취하 신청 - - 경정신청 + - 기일변경 요청 - 03 + - 조정 취하 신청 - 04 + - 경정신청 - 05 기일개최 - 조정 취하 신청 - 경정신청 조정중(직권조정) - 이의신청 - - 직권조정 결정서 상세 + - 직권조정 결정서 상세 - 06 */ + - switch (adjDeputyReqVO.getExpCode()) { - case "01": returnUrl += "expAnsSubmit"; + System.out.println("adjDeputyReqVO.getExpCode() :: "+ adjDeputyReqVO.getExpCode()); + + String expCode = adjDeputyReqVO.getExpCode(); + + switch (expCode) { + case "01": returnUrl += "expAnsSubmit"; break; - case "02": returnUrl += "expAdjstDeputyReqList"; + case "02": returnUrl += "expAdjstDeputyReqCreate"; break; + case "03": returnUrl += "expAdjstChangeDateCreate"; + model.addAttribute("adjstChangeDateVO" , new AdjstChangeDateVO()); + break; + case "04": returnUrl += "expAdjstWithDrawCreate"; + break; + case "05": returnUrl += "expCorReqCreate"; // 경정신청 + model.addAttribute("list", adjstExpService.selectRpplList(adjDeputyReqVO)); // 피신청인 리스트 + break; + case "06": returnUrl += "expOadDetail"; // 직권조정결정서 상세 + break; + case "07": returnUrl += "expOjctRegist"; // 이의 신청 + break; default: returnUrl += "expAnsSubmit"; break; } - + return returnUrl; } diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjstExp/AdjstExp_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjstExp/AdjstExp_SQL_Mysql.xml index e560ba5f..44608725 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/adjstExp/AdjstExp_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/adjstExp/AdjstExp_SQL_Mysql.xml @@ -3,10 +3,11 @@ + - + - + + diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstReqStatusDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstReqStatusDetail.jsp index fac9f1d8..02ce706e 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstReqStatusDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstReqStatusDetail.jsp @@ -76,7 +76,7 @@

[체험]조정진행 상세

-

조정번호 : +

조정번호 : 조정 diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstReqStatusTabDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstReqStatusTabDetail.jsp index a25d39ca..77a9f17e 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstReqStatusTabDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstReqStatusTabDetail.jsp @@ -17,7 +17,15 @@ var index = Number($('#pageExpIndex').val())+1; $('#pageExpIndex').val(index); - tabPageLoad(0); + tabPageLoad(0); + } + + function fncEndPage(){ + + if(confirm("체험하기 종료하면 메인 페이지로 이동합니다.")){ + window.location.href = "/"; + } + } function fncGoAnsSubmit() { @@ -116,7 +124,15 @@ function fn_openPop(expCode) { $('#expCode').val(expCode); - commonPopWindowopenForm("/web/kccadr/adjstExpDetail/popup/openExpExamplePop.do" , "1000", "3000", "openExpExamplePop",$("#pop")); + $('#appliCantNm').val($('#appliCantNmTemp').text()); + $('#resPonDentNm').val($('#resPonDentNmTemp1').text()); + var width = "1000"; + var height = "3000"; + + if(expCode === '04') + height = "700"; + + commonPopWindowopenForm("/web/kccadr/adjstExpDetail/popup/openExpExamplePop.do" , width, height, "openExpExamplePop",$("#pop")); } @@ -128,6 +144,8 @@ " /> " /> " /> + + @@ -215,7 +233,7 @@ resInfo--%>

신청인

-

+

신청인 분류

@@ -231,7 +249,7 @@ resInfo--%>

피신청인 1

-

+

@@ -324,17 +342,17 @@ resInfo--%> - - - + + + - - + + - - + + @@ -372,7 +390,7 @@ resInfo--%> - + diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/expAdjstChangeDateCreate.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/expAdjstChangeDateCreate.jsp new file mode 100644 index 00000000..fcc257ff --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/expAdjstChangeDateCreate.jsp @@ -0,0 +1,512 @@ +<%-- + 대국민 사용자 + Class Name : adjstChangeDateCreate.jsp + Description : 기일 변경 신청 작성 + Modification Information + + 수정일 수정자 수정내용 + ------- -------- --------------------------- + 2021.08.24 우영두 내용 + + author : 우영두 + since : 2021.08.24 + +--%> +<%-- 공통 JS 함수 정의 : /jsp/web/com/webLayout.jsp --%> +<%@ page contentType="text/html; charset=utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> + + +<%@ 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"%> + + + + + +기일변경신청 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + +
+ +<%-- --%> + + + + + + +
+
+
+

기일변경신청

+
+
+
+
+
    +
  • +

    기일변경신청 입니다.

    +
  • + + + + + + + +
+

주의사항 : 분쟁조정신청 작성이 오래 걸릴 경우 신청 중 오류가 발생할 수 있습니다. 신청 취지/원인을 미리 작성한 후 신청하시기 바랍니다.(STEP3 + 신청취지/원인 예문보기)

+
+
+
+ + + + +   +   +   + + + + + + + + + + + + + + + + + + + + + + +
사건, 담당조정부, 신청인, 피신청인등의 정보제공
+

사건

+
+ 조정 + +

담당조정부

+
+

[체험]조정부

+
+

신청인

+
+

+
+

피신청인

+
+

+
+ +
+ + +
+
+

기일변경 정보

+ <%----%> +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
기일변경 정보 : 변경사유, 변경기일, 연락처, 휴대전화, 첨부서류등의 정보 입력
+

필수입력 항목*

+

변경사유

+
+ + +
+

필수입력 항목*

+

변경기일

+
+
+
+
+ + +
+ + +
+ +
+ +
+

필수입력 항목*

+

연락처

+
+ + + - + - + +
+

필수입력 항목*

+

휴대전화

+
+ + + - + - + +
+

필수입력 항목*

+

첨부서류

+

(신분증 첨부 필수)

+
+ + + + +
+ + + + + + + + + + + + + + + + + + + + +
첨부파일 추가 리스트 : 파일명, 종류, 크기, 삭제
파일 명종류크기삭제
+

첨부하실 파일을 마우스로 끌어서 넣어주세요.

+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
첨부파일 추가 리스트 : 파일명, 종류, 크기, 삭제
파일 명종류크기삭제
+ ${fileList.orignlFileNm} + + "> + + "> + + +
+
+
+
+ +
+
+
+ + +
+
+ +
+
+ +
+ + diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstDeputyReqCreate.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/expAdjstDeputyReqCreate.jsp similarity index 86% rename from src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstDeputyReqCreate.jsp rename to src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/expAdjstDeputyReqCreate.jsp index 3829d22a..a03a1474 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstDeputyReqCreate.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/expAdjstDeputyReqCreate.jsp @@ -12,6 +12,8 @@ 조정대리신청 + + + + + + + + + + + + + +
+
+
+

경정신청 등록

+
+
+
+
+
    +
  • +

    경정신청 등록 입니다.

    +
  • +
  • +

    대상추가를 클릭하시면 등록창이 보입니다.

    +
  • + + + +
+

주의사항 : 분쟁조정신청 작성이 오래 걸릴 경우 신청 중 오류가 발생할 수 있습니다. 신청 취지/원인을 미리 작성한 후 신청하시기 바랍니다.(STEP3 + 신청취지/원인 예문보기)

+
+
+ +<%-- --%> +<%-- --%> +<%-- --%> + +
+

경정신청 대상

+
+ + + +
+
+
+ + + + + +
+ + + +
+
+
+ + +
+
+ + +
+
+ + diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/expOadDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/expOadDetail.jsp index 758fbd9b..790e1457 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/expOadDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/expOadDetail.jsp @@ -32,9 +32,32 @@ function fncGoDetail(adrSeq, adrSn){ " /> + +   +   +  
-
+

직권조정결정서 상세

+
+
+
+
    +
  • +

    직권조정결정서 상세 입니다.

    +
  • + + + + + + + +
+

주의사항 : 분쟁조정신청 작성이 오래 걸릴 경우 신청 중 오류가 발생할 수 있습니다. 신청 취지/원인을 미리 작성한 후 신청하시기 바랍니다.(STEP3 + 신청취지/원인 예문보기)

+
+
@@ -48,7 +71,8 @@ function fncGoDetail(adrSeq, adrSn){ @@ -58,7 +82,8 @@ function fncGoDetail(adrSeq, adrSn){ @@ -68,7 +93,7 @@ function fncGoDetail(adrSeq, adrSn){ @@ -78,7 +103,7 @@ function fncGoDetail(adrSeq, adrSn){ @@ -96,7 +121,7 @@ function fncGoDetail(adrSeq, adrSn){ --%> -

+

2022/05/06

<%-- @@ -123,7 +148,7 @@ function fncGoDetail(adrSeq, adrSn){ --%> -

+

2022/05/20

@@ -132,7 +157,7 @@ function fncGoDetail(adrSeq, adrSn){ @@ -141,7 +166,7 @@ function fncGoDetail(adrSeq, adrSn){ @@ -149,7 +174,7 @@ function fncGoDetail(adrSeq, adrSn){

이유

<%-- @@ -200,7 +225,7 @@ function fncGoDetail(adrSeq, adrSn){
- +
diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/expOjctRegist.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/expOjctRegist.jsp new file mode 100644 index 00000000..f3bf9c09 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/expOjctRegist.jsp @@ -0,0 +1,281 @@ +<%-- + 대국민 사용자 + Class Name : ojctRegist.jsp + Description : 이의신청 등록화면 + Modification Information + + 수정일 수정자 수정내용 + ------- -------- --------------------------- + 2021.09.09 이지우 내용 + + author : 이지우 + since : 2021.09.09 + +--%> +<%-- 공통 JS 함수 정의 : /jsp/web/com/webLayout.jsp --%> +<%@ page contentType="text/html; charset=utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> + + + + + + + + + +  +  +  + + +
+
+

이의신청 등록

+ +
+
+
+
    +
  • +

    이의신청 등록 입니다.

    +
  • + + + + + + + +
+

주의사항 : 분쟁조정신청 작성이 오래 걸릴 경우 신청 중 오류가 발생할 수 있습니다. 신청 취지/원인을 미리 작성한 후 신청하시기 바랍니다.(STEP3 + 신청취지/원인 예문보기)

+
+
+
+ + +
+

- +<%-- --%> + [체험]조정부

- +<%-- --%> + 조정

- +

- +

<%-- " size="70"> --%> -

+

주문 예시 작성해야함

<%-- " size="70"> --%> -

+

신청취지

-

+

이유 예시 작성해야함

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
이의신청 등록 : 사건, 사건명, 신청인, 피신청인 등의 정보제공 및 이의신청사유 입력, 첨부파일 선택 등록
+

필수입력 항목*

+

사건

+
+

조정

+
+

필수입력 항목*

+

사건명

+
+<%--

--%> +

[체험]저작물

+
+

필수입력 항목*

+

신청인

+
+

+
+

필수입력 항목*

+

피신청인

+
+

+
+

필수입력 항목*

+

이의신청사유

+
+

필수입력 항목*

+

첨부파일

+
+ + + +
+ + + + + + + + + + + + + + + + + + + +
첨부파일 리스트 : 파일명, 종류, 크기, 삭제
파일 명종류크기삭제
+

첨부하실 파일을 마우스로 끌어서 넣어주세요.

+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + +
첨부파일 리스트 : 파일명, 종류, 크기, 삭제
파일 명종류크기삭제
+ + + + "> + + "> + + +
+
+
+
+ + + +
+
+
+ + +
+
+ +
+ + +
+ + + + " /> + " /> +
\ No newline at end of file From ef8f8d68f26574879979fded56ac5d389d2c2e1e Mon Sep 17 00:00:00 2001 From: hylee Date: Mon, 12 Sep 2022 14:24:39 +0900 Subject: [PATCH 07/12] =?UTF-8?q?refactor:=EA=B3=B5=ED=86=B5UI=EB=B3=80?= =?UTF-8?q?=EA=B2=BD=20-=20=EC=A1=B0=EC=84=9C=EB=82=B4=EC=9A=A9=20?= =?UTF-8?q?=ED=85=8D=EC=8A=A4=ED=8A=B8=20=ED=81=AC=EA=B8=B0=20=ED=99=95?= =?UTF-8?q?=EC=9E=A5,=20=ED=94=BC=EC=8B=A0=EC=B2=AD=EC=9D=B8=20=EC=88=9C?= =?UTF-8?q?=EB=B2=88=20=ED=91=9C=EC=8B=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/adrDetailPop.jsp | 4 +++- .../webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drt/drtDetail.jsp | 2 +- src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drt/drtReg.jsp | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/adrDetailPop.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/adrDetailPop.jsp index 98a6ff6c..3e1faae4 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/adrDetailPop.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/adrDetailPop.jsp @@ -323,10 +323,11 @@ + -

피신청인 정보

+

피신청인 정보${cnt }

@@ -418,6 +419,7 @@
+
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drt/drtDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drt/drtDetail.jsp index 65ef7c94..01bef45b 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drt/drtDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drt/drtDetail.jsp @@ -564,7 +564,7 @@ 조서내용 - + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drt/drtReg.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drt/drtReg.jsp index 04c8ad1d..3db92c69 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drt/drtReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drt/drtReg.jsp @@ -501,7 +501,7 @@ 조서내용 - + From e5142b7a50022aa978e73ab22f3762ad6ef892df Mon Sep 17 00:00:00 2001 From: hylee Date: Tue, 13 Sep 2022 14:10:17 +0900 Subject: [PATCH 08/12] =?UTF-8?q?refactor:=EC=98=88=EB=AC=B8=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=20=EB=B3=B5=EA=B5=AC-=EC=84=9C=EB=B2=84=EC=9D=B4?= =?UTF-8?q?=EC=A0=84=EC=8B=9C=20=EC=B4=88=EA=B8=B0=ED=99=94=EB=90=A8=20(DB?= =?UTF-8?q?=20,=20=EB=A9=94=EB=89=B4=EB=A7=81=ED=81=AC)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adjPgrMgr/exmp/app/web/ExmpAppManagerController.java | 4 +++- src/main/resources/rebel.xml | 8 ++++---- .../jsp/kccadr/adjPgrMgr/exmp/exmpAppManagerList.jsp | 6 +++--- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/exmp/app/web/ExmpAppManagerController.java b/src/main/java/kcc/kccadr/adjPgrMgr/exmp/app/web/ExmpAppManagerController.java index afa68f47..ddd0802f 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/exmp/app/web/ExmpAppManagerController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/exmp/app/web/ExmpAppManagerController.java @@ -61,7 +61,7 @@ public class ExmpAppManagerController { private EgovFileMngService fileMngService; - +///kccadr/adjPgrMgr/expm/AdjustExpmManagerList.do @RequestMapping(value = "/kccadr/adjPgrMgr/exmp/exmpAppManagerList.do") public String exmpAppManagerList(@ModelAttribute("exmpAppManageVO") ExmpManageVO exmpAppManageVO , ModelMap model) throws Exception { if(exmpAppManageVO.getPageUnit() != 10) { @@ -82,6 +82,8 @@ public class ExmpAppManagerController { exmpAppManageVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); exmpAppManageVO.setLastIndex(paginationInfo.getLastRecordIndex()); exmpAppManageVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); + + exmpAppManageVO.setCodeId("CC002"); paginationInfo.setTotalRecordCount(exmpAppManageService.selectExmpAppManagerCount(exmpAppManageVO)); model.addAttribute("paginationInfo", paginationInfo); model.addAttribute("list", exmpAppManageService.selectExmpAppManagerList(exmpAppManageVO)); diff --git a/src/main/resources/rebel.xml b/src/main/resources/rebel.xml index 907219ad..c2e2c0bc 100644 --- a/src/main/resources/rebel.xml +++ b/src/main/resources/rebel.xml @@ -7,20 +7,20 @@ - + - + - + - + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/exmpAppManagerList.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/exmpAppManagerList.jsp index fc4d8c52..92f04d16 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/exmpAppManagerList.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/exmpAppManagerList.jsp @@ -173,9 +173,9 @@
-
- -
+ +<%-- --%> +
From 6036799dfd4a2aa522079a26459adb25968f070d Mon Sep 17 00:00:00 2001 From: hylee Date: Tue, 13 Sep 2022 14:14:52 +0900 Subject: [PATCH 09/12] =?UTF-8?q?refactor:rebel=20=EA=B2=BD=EB=A1=9C=20?= =?UTF-8?q?=EB=B3=B5=EA=B5=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/rebel.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/rebel.xml b/src/main/resources/rebel.xml index c2e2c0bc..20c9d7e6 100644 --- a/src/main/resources/rebel.xml +++ b/src/main/resources/rebel.xml @@ -13,12 +13,12 @@ - + - + From a565f489a56e6f261ce88cb22398474ab8697722 Mon Sep 17 00:00:00 2001 From: hylee Date: Tue, 13 Sep 2022 14:17:14 +0900 Subject: [PATCH 10/12] refactor:add rebel.xml in gitignore --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index e6c7a219..deacff1d 100644 --- a/.gitignore +++ b/.gitignore @@ -74,4 +74,4 @@ buildNumber.properties .mvn/timing.properties # jrebel -rebel.xml +src/main/resources/rebel.xml From 4544a169a7d4f4c01304fbc8325f3276de4503bf Mon Sep 17 00:00:00 2001 From: myname Date: Tue, 13 Sep 2022 14:43:31 +0900 Subject: [PATCH 11/12] =?UTF-8?q?2022-09-13=2014:43=20=EC=82=AC=EA=B1=B4?= =?UTF-8?q?=20=EC=9D=B4=EB=A0=A5=20=EA=B4=80=EB=A6=AC=20=EB=B0=8F=20?= =?UTF-8?q?=EB=90=98=EB=8F=8C=EB=A6=AC=EA=B8=B0=20=EC=9E=91=EC=97=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adr/service/AdjstDeputyReqService.java | 10 +- .../impl/AdjstDeputyReqServiceImpl.java | 70 +++++- .../adr/web/AdjstDeputyReqWebController.java | 14 +- .../ai/web/AdjstIncidentController.java | 15 +- .../kccadr/accdnt/ans/service/AnsService.java | 3 +- .../ans/service/impl/AnsServiceImpl.java | 45 +++- .../kccadr/accdnt/ans/web/AnsController.java | 3 +- .../accdnt/arc/service/CorReqService.java | 12 +- .../arc/service/impl/CorReqServiceImpl.java | 219 ++++++++++++++++-- .../accdnt/arc/web/CorReqController.java | 12 +- .../awd/service/AdjstWithDrawService.java | 6 +- .../impl/AdjstWithDrawServiceImpl.java | 26 ++- .../awd/web/AdjstWithDrawController.java | 9 +- .../kccadr/accdnt/chg/service/ChgService.java | 3 +- .../chg/service/impl/ChgServiceImpl.java | 18 +- .../kccadr/accdnt/chg/web/ChgController.java | 9 +- .../adjPgrMgr/apm/service/ApmService.java | 3 +- .../apm/service/impl/ApmServiceImpl.java | 52 ++++- .../adjPgrMgr/apm/web/ApmController.java | 29 ++- .../adjPgrMgr/arm/web/ArmController.java | 9 +- .../adjPgrMgr/cfrm/web/CfrmController.java | 3 +- .../adjPgrMgr/cmm/service/PgrCmmService.java | 6 +- .../cmm/service/impl/PgrCmmServiceImpl.java | 24 +- .../adjPgrMgr/crt/web/CrtController.java | 3 +- .../dlvinfo/service/DlvinfoService.java | 3 +- .../service/impl/DlvinfoServiceImpl.java | 15 +- .../dlvinfo/web/DlvinfoController.java | 3 +- .../adjPgrMgr/dnt/service/DntService.java | 12 +- .../dnt/service/impl/DntServiceImpl.java | 127 +++++++++- .../adjPgrMgr/dnt/web/DntController.java | 38 ++- .../adjPgrMgr/drt/service/DrtService.java | 15 +- .../drt/service/impl/DrtServiceImpl.java | 183 ++++++++++++++- .../adjPgrMgr/drt/web/DrtController.java | 15 +- .../drtctr/web/DrtCtrController.java | 3 +- .../adjPgrMgr/ent/web/EntController.java | 9 +- .../web/InternalApprovManageController.java | 22 +- .../adjPgrMgr/oad/web/OadController.java | 3 +- .../impl/AdjReqMgrOffLineServiceImpl.java | 6 + .../web/AdjstConciliatorController.java | 19 +- .../adjreqmgr/service/AdjReqMgrService.java | 11 +- .../adjreqmgr/service/impl/AdjReqMgrDAO.java | 1 + .../service/impl/AdjReqMgrServiceImpl.java | 80 ++++++- .../adjreqmgr/web/AdjReqMgrController.java | 57 ++++- .../advc/service/AdrHstryMgrService.java | 6 + .../kccadr/advc/service/AdrHstryMgrVO.java | 38 ++- .../advc/service/impl/AdrHstryMgrDAO.java | 80 ++++++- .../service/impl/AdrHstryMgrServiceImpl.java | 12 +- .../kccadr/aprvl/service/AprvlMgrService.java | 6 +- .../service/impl/AprvlMgrServiceImpl.java | 24 +- .../kccadr/aprvl/web/AprvlMgrController.java | 26 ++- .../cmm/service/impl/VbankServiceImpl.java | 14 +- .../service/KccadrMgrUdtService.java | 4 +- .../service/impl/KccadrMgrUdtServiceImpl.java | 24 +- .../egovProps/globals.properties | 2 +- .../egovProps/globals_dev.properties | 7 +- .../egovProps/globals_local.properties | 3 +- .../advc/AdrHstryMgrDetail_SQL_Cubrid.xml | 41 +++- .../advc/AdrHstryProcessDetail_SQL_Cubrid.xml | 6 +- 58 files changed, 1326 insertions(+), 192 deletions(-) diff --git a/src/main/java/kcc/kccadr/accdnt/adr/service/AdjstDeputyReqService.java b/src/main/java/kcc/kccadr/accdnt/adr/service/AdjstDeputyReqService.java index 1b99457c..6fed5eef 100644 --- a/src/main/java/kcc/kccadr/accdnt/adr/service/AdjstDeputyReqService.java +++ b/src/main/java/kcc/kccadr/accdnt/adr/service/AdjstDeputyReqService.java @@ -8,21 +8,25 @@ public interface AdjstDeputyReqService { void insertAdjstDeputyReqSave(AdjstDeputyReqVO adjDeputyReqVO , String p_code_desc , String p_stat_cd + , String p_adrHstryMgrSeq ) throws Exception; int updateAdjstDeputyReqSave(AdjstDeputyReqVO adjDeputyReqVO , String p_code_desc - , String p_stat_cd + , String p_stat_cd + , String p_adrHstryMgrSeq ) throws Exception; int updateAdjstDeputyReqStatus(AdjstDeputyReqVO adjDeputyReqVO , String p_code_desc - , String p_stat_cd + , String p_stat_cd + , String p_adrHstryMgrSeq ) throws Exception; int deleteAdjstDeputyReqInfo(AdjstDeputyReqVO adjDeputyReqVO , String p_code_desc - , String p_stat_cd + , String p_stat_cd + , String p_adrHstryMgrSeq ) throws Exception; AdjstDeputyReqVO selectAdjstDeputyDetail(AdjstDeputyReqVO adjDeputyReqVO) throws Exception; diff --git a/src/main/java/kcc/kccadr/accdnt/adr/service/impl/AdjstDeputyReqServiceImpl.java b/src/main/java/kcc/kccadr/accdnt/adr/service/impl/AdjstDeputyReqServiceImpl.java index b65b6c34..151f7c21 100644 --- a/src/main/java/kcc/kccadr/accdnt/adr/service/impl/AdjstDeputyReqServiceImpl.java +++ b/src/main/java/kcc/kccadr/accdnt/adr/service/impl/AdjstDeputyReqServiceImpl.java @@ -43,8 +43,11 @@ public class AdjstDeputyReqServiceImpl implements AdjstDeputyReqService { public void insertAdjstDeputyReqSave(AdjstDeputyReqVO adjDeputyReqVO , String p_code_desc , String p_stat_cd + , String p_adrHstryMgrSeq ) throws Exception { - adjDeputyReqVO.setAgntSeq(agntGnrService.getNextStringId()); + String p_agnt_seq = agntGnrService.getNextStringId(); + adjDeputyReqVO.setAgntSeq(p_agnt_seq); + adjDeputyReqVO.setAgntNm(egovCryptoUtil.encrypt(adjDeputyReqVO.getAgntNm())); adjDeputyReqVO.setAgntAddr(egovCryptoUtil.encrypt(adjDeputyReqVO.getAgntAddr())); adjDeputyReqVO.setAgntAddrDtl(egovCryptoUtil.encrypt(adjDeputyReqVO.getAgntAddrDtl())); @@ -53,6 +56,7 @@ public class AdjstDeputyReqServiceImpl implements AdjstDeputyReqService { adjDeputyReqDAO.insertAdjstDeputyReqSave(adjDeputyReqVO); + //이력관리를 위한 adr_hstry_mgr_detail - 2022-09-07 serviceImpl #1 //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 //adr_hstry_mgr에 값 넣기 - 시작 adrHstryMgrDAO.insert4Func(adjDeputyReqVO.getAdrSeq() @@ -62,7 +66,14 @@ public class AdjstDeputyReqServiceImpl implements AdjstDeputyReqService { , p_stat_cd , adjDeputyReqVO.getFrstRegisterId() - , adjDeputyReqVO.getLastUpdusrId()); + , adjDeputyReqVO.getLastUpdusrId() + + , p_adrHstryMgrSeq //, String p_adrHstryMgrSeq + , "I" //, String p_useCd I/U/UI/II/RE + , "ADR_AGNT_MGR" //, String p_tableName + , " WHERE 1=1 AND adr_seq='"+adjDeputyReqVO.getAdrSeq()+"' AND adr_sn='"+adjDeputyReqVO.getAdrSn()+"' AND agnt_seq='"+p_agnt_seq+"' " //, String p_updateQuery + + ); //adr_hstry_mgr에 값 넣기 - 끝 } @@ -75,7 +86,8 @@ public class AdjstDeputyReqServiceImpl implements AdjstDeputyReqService { @Override public int updateAdjstDeputyReqSave(AdjstDeputyReqVO adjDeputyReqVO , String p_code_desc - , String p_stat_cd + , String p_stat_cd + , String p_adrHstryMgrSeq ) throws Exception { adjDeputyReqVO.setAgntNm(egovCryptoUtil.encrypt(adjDeputyReqVO.getAgntNm())); adjDeputyReqVO.setAgntAddr(egovCryptoUtil.encrypt(adjDeputyReqVO.getAgntAddr())); @@ -86,7 +98,9 @@ public class AdjstDeputyReqServiceImpl implements AdjstDeputyReqService { int rs = adjDeputyReqDAO.updateAdjstDeputyReqSave(adjDeputyReqVO); + //이력관리를 위한 adr_hstry_mgr_detail - 2022-09-07 serviceImpl #1 //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 + //이력관리를 위한 adr_hstry_mgr_detail 데이터 관리 추가 - 2022-09-07 //adr_hstry_mgr에 값 넣기 - 시작 adrHstryMgrDAO.insert4Func(adjDeputyReqVO.getAdrSeq() //, "상태코드수정" @@ -95,7 +109,14 @@ public class AdjstDeputyReqServiceImpl implements AdjstDeputyReqService { , p_stat_cd , adjDeputyReqVO.getFrstRegisterId() - , adjDeputyReqVO.getLastUpdusrId()); + , adjDeputyReqVO.getLastUpdusrId() + + , p_adrHstryMgrSeq //, String p_adrHstryMgrSeq + , "I" //, String p_useCd I/U/UI/II/RE + , "ADR_AGNT_MGR" //, String p_tableName + , " WHERE 1=1 AND adr_seq='"+adjDeputyReqVO.getAdrSeq()+"' AND adr_sn='"+adjDeputyReqVO.getAdrSn()+"' AND agnt_seq='"+adjDeputyReqVO.getAgntSeq()+"' " //, String p_updateQuery + + ); //adr_hstry_mgr에 값 넣기 - 끝 return rs; @@ -104,8 +125,12 @@ public class AdjstDeputyReqServiceImpl implements AdjstDeputyReqService { @Override public int updateAdjstDeputyReqStatus(AdjstDeputyReqVO adjDeputyReqVO , String p_code_desc - , String p_stat_cd + , String p_stat_cd + , String p_adrHstryMgrSeq ) throws Exception { + + AdjstDeputyReqVO adjDeputyReqVOTmp = adjDeputyReqDAO.selectAdjstDeputyDetail(adjDeputyReqVO); + int rs = adjDeputyReqDAO.updateAdjstDeputyReqStatus(adjDeputyReqVO); @@ -118,17 +143,34 @@ public class AdjstDeputyReqServiceImpl implements AdjstDeputyReqService { , p_stat_cd , adjDeputyReqVO.getFrstRegisterId() - , adjDeputyReqVO.getLastUpdusrId()); + , adjDeputyReqVO.getLastUpdusrId() + + , p_adrHstryMgrSeq //, String p_adrHstryMgrSeq + , "U" //, String p_useCd I/U/UI/II/RE + , "ADR_AGNT_MGR" //, String p_tableName + , " SET AGNT_SBMT_YN='"+adjDeputyReqVOTmp.getAgntSbmtYn() + +"', AGNT_APPR_YN='"+adjDeputyReqVOTmp.getAgntApprYn() + +"', AGNT_EMAIL_YN='"+adjDeputyReqVOTmp.getAgntEmailYn() + +"', AGNT_SMS_YN='"+adjDeputyReqVOTmp.getAgntSmsYn() + +"', SBMT_YN='"+adjDeputyReqVOTmp.getSbmtYn() + +"', SBMT_DE='"+adjDeputyReqVOTmp.getSbmtDe() + +"', USR_CI='"+adjDeputyReqVOTmp.getUsrCi() + +"', APPR_YN='"+adjDeputyReqVOTmp.getApprYn() + +"', APPR_DE='"+adjDeputyReqVOTmp.getApprDe() + +"' WHERE 1=1 AND adr_seq='"+adjDeputyReqVOTmp.getAdrSeq()+"' AND adr_sn='"+adjDeputyReqVOTmp.getAdrSn()+"' AND agnt_seq='"+adjDeputyReqVOTmp.getAgntSeq()+"' " //, String p_updateQuery + + + ); //adr_hstry_mgr에 값 넣기 - 끝 - - + return rs; } @Override public int deleteAdjstDeputyReqInfo(AdjstDeputyReqVO adjDeputyReqVO , String p_code_desc - , String p_stat_cd + , String p_stat_cd + , String p_adrHstryMgrSeq ) throws Exception { int rs = adjDeputyReqDAO.deleteAdjstDeputyReqInfo(adjDeputyReqVO); @@ -142,8 +184,16 @@ public class AdjstDeputyReqServiceImpl implements AdjstDeputyReqService { , p_stat_cd , adjDeputyReqVO.getFrstRegisterId() - , adjDeputyReqVO.getLastUpdusrId()); + , adjDeputyReqVO.getLastUpdusrId() + + , p_adrHstryMgrSeq //, String p_adrHstryMgrSeq + , "D" //, String p_useCd I/U/UI/II/RE + , "ADR_AGNT_MGR" //, String p_tableName + , "" //, String p_updateQuery + + ); //adr_hstry_mgr에 값 넣기 - 끝 + return rs; } diff --git a/src/main/java/kcc/kccadr/accdnt/adr/web/AdjstDeputyReqWebController.java b/src/main/java/kcc/kccadr/accdnt/adr/web/AdjstDeputyReqWebController.java index b7bda030..2546e46a 100644 --- a/src/main/java/kcc/kccadr/accdnt/adr/web/AdjstDeputyReqWebController.java +++ b/src/main/java/kcc/kccadr/accdnt/adr/web/AdjstDeputyReqWebController.java @@ -150,16 +150,20 @@ public class AdjstDeputyReqWebController { } if("I".equalsIgnoreCase(adjDeputyReqVO.getMode())){ //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 + //이력관리를 위한 adr_hstry_mgr_detail 데이터 관리 추가 - 2022-09-07 adjDeputyReqService.insertAdjstDeputyReqSave(adjDeputyReqVO , "사용자>>나의사건관리>조정진행 상황>조정진행 상세>조정대리신청-등록" //String p_code_desc - CC199 - , "C170" //String p_stat_cd + , "C170" //String p_stat_cd + , "" ); } else if("U".equalsIgnoreCase(adjDeputyReqVO.getMode())) { //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 + //이력관리를 위한 adr_hstry_mgr_detail 데이터 관리 추가 - 2022-09-07 adjDeputyReqService.updateAdjstDeputyReqSave(adjDeputyReqVO , "사용자>>나의사건관리>조정진행 상황>조정진행 상세>조정대리신청-수정" //String p_code_desc - CC199 - , "C180" //String p_stat_cd + , "C180" //String p_stat_cd + , "" ); } @@ -232,7 +236,8 @@ public class AdjstDeputyReqWebController { //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 rs = adjDeputyReqService.updateAdjstDeputyReqStatus(adjDeputyReqVO , "사용자>>나의사건관리>조정진행 상황>조정진행 상세>조정대리신청-제출" //String p_code_desc - CC199 - , "C200" //String p_stat_cd + , "C200" //String p_stat_cd + , "" ); if(rs > 0) { @@ -262,7 +267,8 @@ public class AdjstDeputyReqWebController { //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 int rs = adjDeputyReqService.deleteAdjstDeputyReqInfo(adjDeputyReqVO , "사용자>>나의사건관리>조정진행 상황>조정진행 상세>조정대리신청-삭제" //String p_code_desc - CC199 - , "C190" //String p_stat_cd + , "C190" //String p_stat_cd + , "" ); modelAndView.addObject("result", rs); return modelAndView; diff --git a/src/main/java/kcc/kccadr/accdnt/ai/web/AdjstIncidentController.java b/src/main/java/kcc/kccadr/accdnt/ai/web/AdjstIncidentController.java index ad61fc37..3c3a9223 100644 --- a/src/main/java/kcc/kccadr/accdnt/ai/web/AdjstIncidentController.java +++ b/src/main/java/kcc/kccadr/accdnt/ai/web/AdjstIncidentController.java @@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; +import egovframework.rte.fdl.idgnr.EgovIdGnrService; import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper; import egovframework.rte.psl.dataaccess.util.EgovMap; import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; @@ -88,6 +89,10 @@ public class AdjstIncidentController { @Resource(name = "apmService") private ApmService apmService; + //조정사건 이력관리 일련번호 + @Resource(name="adrHstryMgrSeqGnrService") + private EgovIdGnrService adrHstryMgrSeqGnrService; + /** * 대국민 대시보드 화면 */ @@ -290,7 +295,13 @@ public class AdjstIncidentController { adjstIncidentVO.setLastUpdusrId(userId); adjstIncidentVO.setEdtStatus("01"); // 수정,보완 요청상태 + + //이력관리를 위한 adr_hstry_mgr_detail - 2022-09-07 controller #1 + String s_adrHstryMgrSeq = adrHstryMgrSeqGnrService.getNextStringId(); + + int rs = adjstIncidentService.insertAdjstIncidentReq(adjstIncidentVO); + if(rs > 0 ){ AdjReqMgrVO arv = new AdjReqMgrVO(); @@ -301,7 +312,9 @@ public class AdjstIncidentController { //arv.setAdrSn("1"); //조정회차(필수) 접수 및 기일되지 않았더라도 1회차로 전달 - kccadrMgrUdtService.updateAdrMgrUdt(arv); + kccadrMgrUdtService.updateAdrMgrUdt(arv + , s_adrHstryMgrSeq + ); } modelAndView.addObject("rs", rs); diff --git a/src/main/java/kcc/kccadr/accdnt/ans/service/AnsService.java b/src/main/java/kcc/kccadr/accdnt/ans/service/AnsService.java index 0f332156..74ef4cb5 100644 --- a/src/main/java/kcc/kccadr/accdnt/ans/service/AnsService.java +++ b/src/main/java/kcc/kccadr/accdnt/ans/service/AnsService.java @@ -6,7 +6,8 @@ public interface AnsService { void ansSubmitAjax(AnsVO ansVO , String p_code_desc - , String p_stat_cd + , String p_stat_cd + , String p_adrHstryMgrSeq ) throws Exception; } diff --git a/src/main/java/kcc/kccadr/accdnt/ans/service/impl/AnsServiceImpl.java b/src/main/java/kcc/kccadr/accdnt/ans/service/impl/AnsServiceImpl.java index a2fac8ab..a9eff77b 100644 --- a/src/main/java/kcc/kccadr/accdnt/ans/service/impl/AnsServiceImpl.java +++ b/src/main/java/kcc/kccadr/accdnt/ans/service/impl/AnsServiceImpl.java @@ -63,7 +63,8 @@ public class AnsServiceImpl implements AnsService { @Override public void ansSubmitAjax(AnsVO ansVO , String p_code_desc - , String p_stat_cd + , String p_stat_cd + , String p_adrHstryMgrSeq ) throws Exception { /* * String resPonDentSeq = ansVO.getResPonDentSeq(); @@ -76,8 +77,8 @@ public class AnsServiceImpl implements AnsService { ansVO.setRpplSeq(ansVO.getAppliCantSeq()); } - ansDAO.ansSubmitAjax_setp1(ansVO); - ansDAO.ansSubmitAjax_setp2(ansVO); + ansDAO.ansSubmitAjax_setp1(ansVO); //ADR_RPPL_DOC + //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 @@ -89,9 +90,43 @@ public class AnsServiceImpl implements AnsService { , p_stat_cd , ansVO.getFrstRegisterId() - , ansVO.getLastUpdusrId()); + , ansVO.getLastUpdusrId() + + , p_adrHstryMgrSeq //, String p_adrHstryMgrSeq + , "I" //, String p_useCd I/U/UI/II/RE + , "ADR_RPPL_DOC" //, String p_tableName + , " WHERE 1=1 AND adr_seq='"+ansVO.getAdrSeq() + +"' AND adr_sn='"+ansVO.getAdrSn() + +"' AND rppl_doc_seq='"+ansVO.getRpplDocSeq() + +"' " //, String p_updateQuery + + ); //adr_hstry_mgr에 값 넣기 - 끝 - + + ansDAO.ansSubmitAjax_setp2(ansVO); //ADR_RPPL_DOC_OPEN + + //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 + //adr_hstry_mgr에 값 넣기 - 시작 + adrHstryMgrDAO.insert4Func(ansVO.getAdrSeq() + //, "상태코드수정" + , p_code_desc + //, adjReqMgrVO.getStatCd() + , p_stat_cd + + , ansVO.getFrstRegisterId() + , ansVO.getLastUpdusrId() + + , p_adrHstryMgrSeq //, String p_adrHstryMgrSeq + , "I" //, String p_useCd I/U/UI/II/RE + , "ADR_RPPL_DOC_OPEN" //, String p_tableName + , " WHERE 1=1 AND adr_seq='"+ansVO.getAdrSeq() + +"' AND adr_sn='"+ansVO.getAdrSn() + +"' AND rppl_doc_seq='"+ansVO.getRpplDocSeq() + +"' AND rppl_seq='"+ansVO.getRpplSeq() + +"' " //, String p_updateQuery + + ); + //adr_hstry_mgr에 값 넣기 - 끝 } } diff --git a/src/main/java/kcc/kccadr/accdnt/ans/web/AnsController.java b/src/main/java/kcc/kccadr/accdnt/ans/web/AnsController.java index b705e93c..ae769195 100644 --- a/src/main/java/kcc/kccadr/accdnt/ans/web/AnsController.java +++ b/src/main/java/kcc/kccadr/accdnt/ans/web/AnsController.java @@ -113,7 +113,8 @@ public class AnsController { //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 ansService.ansSubmitAjax(ansVO , "사용자>>나의사건관리>조정진행 상황>조정진행 상세>답변서제출" //String p_code_desc - CC199 - , "C150" //String p_stat_cd + , "C150" //String p_stat_cd + , "" ); modelAndView.addObject("result", "success"); diff --git a/src/main/java/kcc/kccadr/accdnt/arc/service/CorReqService.java b/src/main/java/kcc/kccadr/accdnt/arc/service/CorReqService.java index a894f7ad..c8e0bef7 100644 --- a/src/main/java/kcc/kccadr/accdnt/arc/service/CorReqService.java +++ b/src/main/java/kcc/kccadr/accdnt/arc/service/CorReqService.java @@ -13,19 +13,23 @@ public interface CorReqService { int corReqCreateAjax(CorReqVO corReqVO, CorReqArrayVO corArrReqVO , String p_code_desc - , String p_stat_cd + , String p_stat_cd + , String p_adrHstryMgrSeq ) throws Exception; int corReqDelAjax(CorReqVO corReqVO , String p_code_desc - , String p_stat_cd + , String p_stat_cd + , String p_adrHstryMgrSeq ) throws Exception; int corReqUpdAjax(CorReqVO corReqVO, CorReqArrayVO corReqArrayVO , String p_code_desc - , String p_stat_cd + , String p_stat_cd + , String p_adrHstryMgrSeq ) throws Exception; int corReqAppAjax(CorReqVO corReqVO , String p_code_desc - , String p_stat_cd + , String p_stat_cd + , String p_adrHstryMgrSeq ) throws Exception; List selectMemMgrList(CorReqVO corReqVO) throws Exception; diff --git a/src/main/java/kcc/kccadr/accdnt/arc/service/impl/CorReqServiceImpl.java b/src/main/java/kcc/kccadr/accdnt/arc/service/impl/CorReqServiceImpl.java index f0640992..919cb868 100644 --- a/src/main/java/kcc/kccadr/accdnt/arc/service/impl/CorReqServiceImpl.java +++ b/src/main/java/kcc/kccadr/accdnt/arc/service/impl/CorReqServiceImpl.java @@ -191,7 +191,8 @@ public class CorReqServiceImpl implements CorReqService { @Override public int corReqCreateAjax(CorReqVO corReqVO, CorReqArrayVO corArrReqVO , String p_code_desc - , String p_stat_cd + , String p_stat_cd + , String p_adrHstryMgrSeq ) throws Exception { /*encpyptVo(corReqVO); corReqDAO.corReqCreateAjax_step1(corReqVO); @@ -201,6 +202,29 @@ public class CorReqServiceImpl implements CorReqService { corReqVO.setRpplChgSeq(rppIdgenService.getNextStringId()); corReqDAO.corReqCreateAjax_step1(corReqVO); + //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 + //adr_hstry_mgr에 값 넣기 - 시작 + adrHstryMgrDAO.insert4Func(corReqVO.getAdrSeq() + //, "상태코드수정" + , p_code_desc + //, adjReqMgrVO.getStatCd() + , p_stat_cd + + , corReqVO.getFrstRegisterId() + , corReqVO.getLastUpdusrId() + + , p_adrHstryMgrSeq //, String p_adrHstryMgrSeq + , "I" //, String p_useCd I/U/UI/II/RE + , "ADR_RPPL_CHG" //, String p_tableName + , " WHERE 1=1 AND adr_seq='"+corReqVO.getAdrSeq() + +"' AND rppl_chg_seq='"+corReqVO.getRpplChgSeq() + +"' " //, String p_updateQuery + + ); + //adr_hstry_mgr에 값 넣기 - 끝 + + + if (StringUtil.isNotEmpty(corArrReqVO.getOldRpplSeq_0())) { corReqVO.setRpplChgDetailSeq(rpplChgDetailIdgenService.getNextStringId()); corReqVO.setRpplChgCn1(corArrReqVO.getRpplChgCn1_0()); @@ -216,6 +240,7 @@ public class CorReqServiceImpl implements CorReqService { encpyptVo(corReqVO); corReqDAO.corReqCreateAjax_step2(corReqVO); + //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 //adr_hstry_mgr에 값 넣기 - 시작 adrHstryMgrDAO.insert4Func(corReqVO.getAdrSeq() @@ -225,7 +250,18 @@ public class CorReqServiceImpl implements CorReqService { , p_stat_cd , corReqVO.getFrstRegisterId() - , corReqVO.getLastUpdusrId()); + , corReqVO.getLastUpdusrId() + + , p_adrHstryMgrSeq //, String p_adrHstryMgrSeq + , "I" //, String p_useCd I/U/UI/II/RE + , "ADR_RPPL_CHG_DETAIL" //, String p_tableName + , " WHERE 1=1 AND adr_seq='"+corReqVO.getAdrSeq() + +"' AND rppl_chg_seq='"+corReqVO.getRpplChgSeq() + +"' AND rppl_chg_detail_seq='"+corReqVO.getRpplChgDetailSeq() + + +"' " //, String p_updateQuery + + ); //adr_hstry_mgr에 값 넣기 - 끝 } @@ -253,7 +289,18 @@ public class CorReqServiceImpl implements CorReqService { , p_stat_cd , corReqVO.getFrstRegisterId() - , corReqVO.getLastUpdusrId()); + , corReqVO.getLastUpdusrId() + + , p_adrHstryMgrSeq //, String p_adrHstryMgrSeq + , "I" //, String p_useCd I/U/UI/II/RE + , "ADR_RPPL_CHG_DETAIL" //, String p_tableName + , " WHERE 1=1 AND adr_seq='"+corReqVO.getAdrSeq() + +"' AND rppl_chg_seq='"+corReqVO.getRpplChgSeq() + +"' AND rppl_chg_detail_seq='"+corReqVO.getRpplChgDetailSeq() + + +"' " //, String p_updateQuery + + ); //adr_hstry_mgr에 값 넣기 - 끝 } @@ -281,7 +328,18 @@ public class CorReqServiceImpl implements CorReqService { , p_stat_cd , corReqVO.getFrstRegisterId() - , corReqVO.getLastUpdusrId()); + , corReqVO.getLastUpdusrId() + + , p_adrHstryMgrSeq //, String p_adrHstryMgrSeq + , "I" //, String p_useCd I/U/UI/II/RE + , "ADR_RPPL_CHG_DETAIL" //, String p_tableName + , " WHERE 1=1 AND adr_seq='"+corReqVO.getAdrSeq() + +"' AND rppl_chg_seq='"+corReqVO.getRpplChgSeq() + +"' AND rppl_chg_detail_seq='"+corReqVO.getRpplChgDetailSeq() + + +"' " //, String p_updateQuery + + ); //adr_hstry_mgr에 값 넣기 - 끝 } @@ -309,7 +367,18 @@ public class CorReqServiceImpl implements CorReqService { , p_stat_cd , corReqVO.getFrstRegisterId() - , corReqVO.getLastUpdusrId()); + , corReqVO.getLastUpdusrId() + + , p_adrHstryMgrSeq //, String p_adrHstryMgrSeq + , "I" //, String p_useCd I/U/UI/II/RE + , "ADR_RPPL_CHG_DETAIL" //, String p_tableName + , " WHERE 1=1 AND adr_seq='"+corReqVO.getAdrSeq() + +"' AND rppl_chg_seq='"+corReqVO.getRpplChgSeq() + +"' AND rppl_chg_detail_seq='"+corReqVO.getRpplChgDetailSeq() + + +"' " //, String p_updateQuery + + ); //adr_hstry_mgr에 값 넣기 - 끝 } @@ -337,7 +406,18 @@ public class CorReqServiceImpl implements CorReqService { , p_stat_cd , corReqVO.getFrstRegisterId() - , corReqVO.getLastUpdusrId()); + , corReqVO.getLastUpdusrId() + + , p_adrHstryMgrSeq //, String p_adrHstryMgrSeq + , "I" //, String p_useCd I/U/UI/II/RE + , "ADR_RPPL_CHG_DETAIL" //, String p_tableName + , " WHERE 1=1 AND adr_seq='"+corReqVO.getAdrSeq() + +"' AND rppl_chg_seq='"+corReqVO.getRpplChgSeq() + +"' AND rppl_chg_detail_seq='"+corReqVO.getRpplChgDetailSeq() + + +"' " //, String p_updateQuery + + ); //adr_hstry_mgr에 값 넣기 - 끝 } @@ -348,7 +428,8 @@ public class CorReqServiceImpl implements CorReqService { @Override public int corReqAppAjax(CorReqVO corReqVO , String p_code_desc - , String p_stat_cd + , String p_stat_cd + , String p_adrHstryMgrSeq ) throws Exception { corReqVO.setApprYn(KccadrConstants.ADR_CNCL_RULER_REQ); // 피신청인경정신청 corReqDAO.corReqAppAjax_step1(corReqVO); @@ -362,7 +443,17 @@ public class CorReqServiceImpl implements CorReqService { , p_stat_cd , corReqVO.getFrstRegisterId() - , corReqVO.getLastUpdusrId()); + , corReqVO.getLastUpdusrId() + + , p_adrHstryMgrSeq //, String p_adrHstryMgrSeq + , "I" //, String p_useCd I/U/UI/II/RE + , "ADR_RPPL_CHG" //, String p_tableName + , " WHERE 1=1 AND adr_seq='"+corReqVO.getAdrSeq() + +"' AND rppl_chg_seq='"+corReqVO.getRpplChgSeq() + + +"' " //, String p_updateQuery + + ); //adr_hstry_mgr에 값 넣기 - 끝 return 0; @@ -371,12 +462,12 @@ public class CorReqServiceImpl implements CorReqService { @Override public int corReqDelAjax(CorReqVO corReqVO , String p_code_desc - , String p_stat_cd + , String p_stat_cd + , String p_adrHstryMgrSeq ) throws Exception { corReqDAO.corReqDelAjax_step1(corReqVO); - corReqDAO.corReqDelAjax_step2(corReqVO); - + //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 //adr_hstry_mgr에 값 넣기 - 시작 adrHstryMgrDAO.insert4Func(corReqVO.getAdrSeq() @@ -386,16 +477,53 @@ public class CorReqServiceImpl implements CorReqService { , p_stat_cd , corReqVO.getFrstRegisterId() - , corReqVO.getLastUpdusrId()); + , corReqVO.getLastUpdusrId() + + , p_adrHstryMgrSeq //, String p_adrHstryMgrSeq + , "I" //, String p_useCd I/U/UI/II/RE + , "ADR_RPPL_CHG" //, String p_tableName + , " WHERE 1=1 AND adr_seq='"+corReqVO.getAdrSeq() + +"' AND rppl_chg_seq='"+corReqVO.getRpplChgSeq() + + +"' " //, String p_updateQuery + + ); //adr_hstry_mgr에 값 넣기 - 끝 + + corReqDAO.corReqDelAjax_step2(corReqVO); + + //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 + //adr_hstry_mgr에 값 넣기 - 시작 + adrHstryMgrDAO.insert4Func(corReqVO.getAdrSeq() + //, "상태코드수정" + , p_code_desc + //, adjReqMgrVO.getStatCd() + , p_stat_cd + + , corReqVO.getFrstRegisterId() + , corReqVO.getLastUpdusrId() + + , p_adrHstryMgrSeq //, String p_adrHstryMgrSeq + , "I" //, String p_useCd I/U/UI/II/RE + , "ADR_RPPL_CHG_DETAIL" //, String p_tableName + , " WHERE 1=1 AND adr_seq='"+corReqVO.getAdrSeq() + +"' AND rppl_chg_seq='"+corReqVO.getRpplChgSeq() + +"' AND rppl_chg_detail_seq='"+corReqVO.getRpplChgDetailSeq() + + +"' " //, String p_updateQuery + + ); + //adr_hstry_mgr에 값 넣기 - 끝 + return 0; } @Override public int corReqUpdAjax(CorReqVO corReqVO, CorReqArrayVO corArrReqVO , String p_code_desc - , String p_stat_cd + , String p_stat_cd + , String p_adrHstryMgrSeq ) throws Exception { /*encpyptVo(corReqVO); corReqDAO.corReqUpdAjax_step1(corReqVO); @@ -424,7 +552,18 @@ public class CorReqServiceImpl implements CorReqService { , p_stat_cd , corReqVO.getFrstRegisterId() - , corReqVO.getLastUpdusrId()); + , corReqVO.getLastUpdusrId() + + , p_adrHstryMgrSeq //, String p_adrHstryMgrSeq + , "I" //, String p_useCd I/U/UI/II/RE + , "ADR_RPPL_CHG_DETAIL" //, String p_tableName + , " WHERE 1=1 AND adr_seq='"+corReqVO.getAdrSeq() + +"' AND rppl_chg_seq='"+corReqVO.getRpplChgSeq() + +"' AND rppl_chg_detail_seq='"+corReqVO.getRpplChgDetailSeq() + + +"' " //, String p_updateQuery + + ); //adr_hstry_mgr에 값 넣기 - 끝 } @@ -451,7 +590,18 @@ public class CorReqServiceImpl implements CorReqService { , p_stat_cd , corReqVO.getFrstRegisterId() - , corReqVO.getLastUpdusrId()); + , corReqVO.getLastUpdusrId() + + , p_adrHstryMgrSeq //, String p_adrHstryMgrSeq + , "I" //, String p_useCd I/U/UI/II/RE + , "ADR_RPPL_CHG_DETAIL" //, String p_tableName + , " WHERE 1=1 AND adr_seq='"+corReqVO.getAdrSeq() + +"' AND rppl_chg_seq='"+corReqVO.getRpplChgSeq() + +"' AND rppl_chg_detail_seq='"+corReqVO.getRpplChgDetailSeq() + + +"' " //, String p_updateQuery + + ); //adr_hstry_mgr에 값 넣기 - 끝 } @@ -478,7 +628,18 @@ public class CorReqServiceImpl implements CorReqService { , p_stat_cd , corReqVO.getFrstRegisterId() - , corReqVO.getLastUpdusrId()); + , corReqVO.getLastUpdusrId() + + , p_adrHstryMgrSeq //, String p_adrHstryMgrSeq + , "I" //, String p_useCd I/U/UI/II/RE + , "ADR_RPPL_CHG_DETAIL" //, String p_tableName + , " WHERE 1=1 AND adr_seq='"+corReqVO.getAdrSeq() + +"' AND rppl_chg_seq='"+corReqVO.getRpplChgSeq() + +"' AND rppl_chg_detail_seq='"+corReqVO.getRpplChgDetailSeq() + + +"' " //, String p_updateQuery + + ); //adr_hstry_mgr에 값 넣기 - 끝 } @@ -505,7 +666,18 @@ public class CorReqServiceImpl implements CorReqService { , p_stat_cd , corReqVO.getFrstRegisterId() - , corReqVO.getLastUpdusrId()); + , corReqVO.getLastUpdusrId() + + , p_adrHstryMgrSeq //, String p_adrHstryMgrSeq + , "I" //, String p_useCd I/U/UI/II/RE + , "ADR_RPPL_CHG_DETAIL" //, String p_tableName + , " WHERE 1=1 AND adr_seq='"+corReqVO.getAdrSeq() + +"' AND rppl_chg_seq='"+corReqVO.getRpplChgSeq() + +"' AND rppl_chg_detail_seq='"+corReqVO.getRpplChgDetailSeq() + + +"' " //, String p_updateQuery + + ); //adr_hstry_mgr에 값 넣기 - 끝 } @@ -532,7 +704,18 @@ public class CorReqServiceImpl implements CorReqService { , p_stat_cd , corReqVO.getFrstRegisterId() - , corReqVO.getLastUpdusrId()); + , corReqVO.getLastUpdusrId() + + , p_adrHstryMgrSeq //, String p_adrHstryMgrSeq + , "I" //, String p_useCd I/U/UI/II/RE + , "ADR_RPPL_CHG_DETAIL" //, String p_tableName + , " WHERE 1=1 AND adr_seq='"+corReqVO.getAdrSeq() + +"' AND rppl_chg_seq='"+corReqVO.getRpplChgSeq() + +"' AND rppl_chg_detail_seq='"+corReqVO.getRpplChgDetailSeq() + + +"' " //, String p_updateQuery + + ); //adr_hstry_mgr에 값 넣기 - 끝 } diff --git a/src/main/java/kcc/kccadr/accdnt/arc/web/CorReqController.java b/src/main/java/kcc/kccadr/accdnt/arc/web/CorReqController.java index 4fc82575..f603868b 100644 --- a/src/main/java/kcc/kccadr/accdnt/arc/web/CorReqController.java +++ b/src/main/java/kcc/kccadr/accdnt/arc/web/CorReqController.java @@ -290,7 +290,8 @@ public class CorReqController { //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 corReqService.corReqCreateAjax(corReqVO, corArrReqVO , "사용자>>나의사건관리>조정진행 상황>조정진행 상세>경정신청-등록" //String p_code_desc - CC199 - , "C210" //String p_stat_cd + , "C210" //String p_stat_cd + , "" ); modelAndView.addObject("result", "success"); @@ -326,7 +327,8 @@ public class CorReqController { corReqService.corReqUpdAjax(corReqVO, corReqArrayVO , "사용자>>나의사건관리>조정진행 상황>조정진행 상세>경정신청-수정" //String p_code_desc - CC199 - , "C220" //String p_stat_cd + , "C220" //String p_stat_cd + , "" ); modelAndView.addObject("result", "success"); @@ -363,7 +365,8 @@ public class CorReqController { corReqService.corReqDelAjax(corReqVO , "사용자>>나의사건관리>조정진행 상황>조정진행 상세>경정신청-삭제" //String p_code_desc - CC199 - , "C230" //String p_stat_cd + , "C230" //String p_stat_cd + , "" ); } @@ -413,7 +416,8 @@ public class CorReqController { corReqService.corReqAppAjax(corReqVO , "사용자>>나의사건관리>조정진행 상황>조정진행 상세>경정신청등록-제출" //String p_code_desc - CC199 - , "C240" //String p_stat_cd + , "C240" //String p_stat_cd + , "" ); 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 8d5ba278..ff3d751b 100644 --- a/src/main/java/kcc/kccadr/accdnt/awd/service/AdjstWithDrawService.java +++ b/src/main/java/kcc/kccadr/accdnt/awd/service/AdjstWithDrawService.java @@ -6,12 +6,14 @@ public interface AdjstWithDrawService { Integer insertAndUpdateAdjstWithDrawSave(AdjstWithDrawVO adjstWithDrawVO , String p_code_desc - , String p_stat_cd + , String p_stat_cd + , String p_adrHstryMgrSeq ) throws Exception; Integer deleteAdjstWithDraw(AdjstWithDrawVO adjstWithDrawVO , String p_code_desc - , String p_stat_cd + , String p_stat_cd + , String p_adrHstryMgrSeq ) 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 74baae44..52f34940 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 @@ -31,7 +31,8 @@ public class AdjstWithDrawServiceImpl implements AdjstWithDrawService { @Override public Integer insertAndUpdateAdjstWithDrawSave(AdjstWithDrawVO adjstWithDrawVO , String p_code_desc - , String p_stat_cd + , String p_stat_cd + , String p_adrHstryMgrSeq ) throws Exception { AdjstWithDrawVO info = selectAdjstWithDrawInfo(adjstWithDrawVO); if(info == null){ @@ -49,7 +50,16 @@ public class AdjstWithDrawServiceImpl implements AdjstWithDrawService { , p_stat_cd , adjstWithDrawVO.getFrstRegisterId() - , adjstWithDrawVO.getLastUpdusrId()); + , adjstWithDrawVO.getLastUpdusrId() + + , p_adrHstryMgrSeq //, String p_adrHstryMgrSeq + , "I" //, String p_useCd I/U/UI/II/RE + , "ADR_CNCL_MGR" //, String p_tableName + , " WHERE 1=1 AND adr_seq='"+adjstWithDrawVO.getAdrSeq() + +"' AND adr_cncl_seq='"+adjstWithDrawVO.getAdrCnclSeq() + +"' " //, String p_updateQuery + + ); //adr_hstry_mgr에 값 넣기 - 끝 return rs; @@ -58,7 +68,8 @@ public class AdjstWithDrawServiceImpl implements AdjstWithDrawService { @Override public Integer deleteAdjstWithDraw(AdjstWithDrawVO adjstWithDrawVO , String p_code_desc - , String p_stat_cd + , String p_stat_cd + , String p_adrHstryMgrSeq ) throws Exception { int rs = adjstWithDrawDAO.deleteAdjstWithDraw(adjstWithDrawVO); @@ -71,7 +82,14 @@ public class AdjstWithDrawServiceImpl implements AdjstWithDrawService { , p_stat_cd , adjstWithDrawVO.getFrstRegisterId() - , adjstWithDrawVO.getLastUpdusrId()); + , adjstWithDrawVO.getLastUpdusrId() + + , p_adrHstryMgrSeq //, String p_adrHstryMgrSeq + , "D" //, String p_useCd I/U/UI/II/RE + , "ADR_CNCL_MGR" //, String p_tableName + , "" //, String p_updateQuery + + ); //adr_hstry_mgr에 값 넣기 - 끝 return rs; 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 e5ff0503..94c23a71 100644 --- a/src/main/java/kcc/kccadr/accdnt/awd/web/AdjstWithDrawController.java +++ b/src/main/java/kcc/kccadr/accdnt/awd/web/AdjstWithDrawController.java @@ -84,7 +84,8 @@ public class AdjstWithDrawController { //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 int rs = adjstWithDrawService.insertAndUpdateAdjstWithDrawSave(adjstWithDrawVO , "사용자>>나의사건관리>조정진행 상황>조정진행 상세>조정취하등록" //String p_code_desc - CC199 - , "C270" //String p_stat_cd + , "C270" //String p_stat_cd + , "" ); modelAndView.addObject("rs", (rs>0)); @@ -99,7 +100,8 @@ public class AdjstWithDrawController { //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 int rs = adjstWithDrawService.deleteAdjstWithDraw(adjstWithDrawVO , "사용자>>나의사건관리>조정진행 상황>조정진행 상세>조정취하등록-삭제" //String p_code_desc - CC199 - , "C280" //String p_stat_cd + , "C280" //String p_stat_cd + , "" ); modelAndView.addObject("rs", (rs>0)); return modelAndView; @@ -139,7 +141,8 @@ public class AdjstWithDrawController { //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 rs = adjstWithDrawService.insertAndUpdateAdjstWithDrawSave(adjstWithDrawVO , "사용자>>나의사건관리>조정진행 상황>조정진행 상세>조정취하등록-제출" //String p_code_desc - CC199 - , "C290" //String p_stat_cd + , "C290" //String p_stat_cd + , "" ); if(rs > 0) { modelAndView.addObject("status", "success"); diff --git a/src/main/java/kcc/kccadr/accdnt/chg/service/ChgService.java b/src/main/java/kcc/kccadr/accdnt/chg/service/ChgService.java index ff7feed8..8c7f5151 100644 --- a/src/main/java/kcc/kccadr/accdnt/chg/service/ChgService.java +++ b/src/main/java/kcc/kccadr/accdnt/chg/service/ChgService.java @@ -26,7 +26,8 @@ public interface ChgService { void updateRpplId(RpplVO rpplVO , String p_code_desc - , String p_stat_cd + , String p_stat_cd + , String p_adrHstryMgrSeq ) throws Exception; } diff --git a/src/main/java/kcc/kccadr/accdnt/chg/service/impl/ChgServiceImpl.java b/src/main/java/kcc/kccadr/accdnt/chg/service/impl/ChgServiceImpl.java index 6f689116..87793d6c 100644 --- a/src/main/java/kcc/kccadr/accdnt/chg/service/impl/ChgServiceImpl.java +++ b/src/main/java/kcc/kccadr/accdnt/chg/service/impl/ChgServiceImpl.java @@ -65,12 +65,14 @@ public class ChgServiceImpl implements ChgService { @Override public void updateRpplId(RpplVO rpplVO , String p_code_desc - , String p_stat_cd + , String p_stat_cd + , String p_adrHstryMgrSeq ) throws Exception { chgDAO.updateRpplId(rpplVO); + ///*수정내용에 대한 이력관리는 지원하지 않는다. //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 //adr_hstry_mgr에 값 넣기 - 시작 adrHstryMgrDAO.insert4Func(rpplVO.getAdrSeq() @@ -79,10 +81,16 @@ public class ChgServiceImpl implements ChgService { //, adjReqMgrVO.getStatCd() , p_stat_cd - , rpplVO.getFrstRegisterId() - , rpplVO.getLastUpdusrId()); - //adr_hstry_mgr에 값 넣기 - 끝 - + , rpplVO.getFrstRegisterId() + , rpplVO.getLastUpdusrId() + + , p_adrHstryMgrSeq //, String p_adrHstryMgrSeq + , "U" //, String p_useCd I/U/UI/II/RE + , "ADR_RPPL" //, String p_tableName + , "" //, String p_updateQuery + + ); + //adr_hstry_mgr에 값 넣기 - 끝 } diff --git a/src/main/java/kcc/kccadr/accdnt/chg/web/ChgController.java b/src/main/java/kcc/kccadr/accdnt/chg/web/ChgController.java index 29780900..41d1dea2 100644 --- a/src/main/java/kcc/kccadr/accdnt/chg/web/ChgController.java +++ b/src/main/java/kcc/kccadr/accdnt/chg/web/ChgController.java @@ -174,7 +174,8 @@ public class ChgController { //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 chgService.updateRpplId(rpplVO , "사용자>>나의사건관리>온라인조정전환>전자조정전환" //String p_code_desc - CC199 - , "C050" //String p_stat_cd + , "C050" //String p_stat_cd + , "" ); modelAndView.addObject("result", "success"); @@ -184,7 +185,8 @@ public class ChgController { //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 chgService.updateRpplId(rpplVO , "사용자>>나의사건관리>온라인조정전환>전자조정전환" //String p_code_desc - CC199 - , "C050" //String p_stat_cd + , "C050" //String p_stat_cd + , "" ); modelAndView.addObject("result", "success"); @@ -251,7 +253,8 @@ public class ChgController { //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 int rs = apmService.addRpplPopAjax(rpplVO , "사용자>>나의사건관리>온라인조정전환>대리인등록" //String p_code_desc - CC199 - , "C040" //String p_stat_cd + , "C040" //String p_stat_cd + , "" ); diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/apm/service/ApmService.java b/src/main/java/kcc/kccadr/adjPgrMgr/apm/service/ApmService.java index 221e0026..26b06502 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/apm/service/ApmService.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/apm/service/ApmService.java @@ -42,7 +42,8 @@ public interface ApmService { int addRpplPopAjax(RpplVO rpplVO , String p_code_desc - , String p_stat_cd + , String p_stat_cd + , String p_adrHstryMgrSeq ) throws Exception; ApmVO selectAppChgPop(ApmVO apmVO) throws Exception; diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/apm/service/impl/ApmServiceImpl.java b/src/main/java/kcc/kccadr/adjPgrMgr/apm/service/impl/ApmServiceImpl.java index b2715929..26b2ffc2 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/apm/service/impl/ApmServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/apm/service/impl/ApmServiceImpl.java @@ -115,10 +115,12 @@ public class ApmServiceImpl implements ApmService { public int updateAdrEndDe(ApmVO apmVO , String p_code_desc , String p_stat_cd + //, String p_adrHstryMgrSeq ) throws Exception { int i_ret = apmDAO.updateAdrEndDe(apmVO); if (i_ret>0) { + /* - 기간연장에 대한 내용도 이력 관리 안함 //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 //adr_hstry_mgr에 값 넣기 - 시작 adrHstryMgrDAO.insert4Func(apmVO.getAdrSeq() @@ -128,8 +130,19 @@ public class ApmServiceImpl implements ApmService { , p_stat_cd , apmVO.getFrstRegisterId() - , apmVO.getLastUpdusrId()); - //adr_hstry_mgr에 값 넣기 - 끝 + , apmVO.getLastUpdusrId() + + , p_adrHstryMgrSeq //, String p_adrHstryMgrSeq + , "U" //, String p_useCd I/U/UI/II/RE + , "ADR_MGR_MASTER" //, String p_tableName + , " SET ADR_END_DE = ADD_MONTHS(ADR_END_DE,-1 ), ADR_END_ADD_YN = 'N' " + +" WHERE 1=1 AND adr_seq='"+apmVO.getAdrSeq() + +"' " //, String p_updateQuery + + ); + //adr_hstry_mgr에 값 넣기 - 끝 + * + */ } return i_ret; @@ -187,7 +200,8 @@ public class ApmServiceImpl implements ApmService { @Override public int addRpplPopAjax(RpplVO rpplVO , String p_code_desc - , String p_stat_cd + , String p_stat_cd + , String p_adrHstryMgrSeq ) throws Exception { List list = apmDAO.selectRpplConnNoList(rpplVO); @@ -230,7 +244,16 @@ public class ApmServiceImpl implements ApmService { , p_stat_cd , rpplVO.getFrstRegisterId() - , rpplVO.getLastUpdusrId()); + , rpplVO.getLastUpdusrId() + + , p_adrHstryMgrSeq //, String p_adrHstryMgrSeq + , "I" //, String p_useCd I/U/UI/II/RE + , "ADR_RPPL" //, String p_tableName + , " WHERE 1=1 AND adr_seq='"+rpplVO.getAdrSeq() + +"' AND rppl_seq='"+rpplVO.getRpplSeq() + +"' " //, String p_updateQuery + + ); //adr_hstry_mgr에 값 넣기 - 끝 @@ -307,9 +330,11 @@ public class ApmServiceImpl implements ApmService { public void updateApprYn(CorReqVO corReqVO , String p_code_desc , String p_stat_cd + //, String p_adrHstryMgrSeq ) throws Exception{ apmDAO.updateApprYn(corReqVO); + /* 피신청인 경정신청에 대한 결재 변경 //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 //adr_hstry_mgr에 값 넣기 - 시작 adrHstryMgrDAO.insert4Func(corReqVO.getAdrSeq() @@ -319,8 +344,25 @@ public class ApmServiceImpl implements ApmService { , p_stat_cd , corReqVO.getFrstRegisterId() - , corReqVO.getLastUpdusrId()); + , corReqVO.getLastUpdusrId() + + , p_adrHstryMgrSeq //, String p_adrHstryMgrSeq + , "I" //, String p_useCd I/U/UI/II/RE + , "ADR_CNCL_MGR" //, String p_tableName + , " WHERE 1=1 AND adr_seq='"+adjstWithDrawVO.getAdrSeq() + +"' AND adr_cncl_seq='"+adjstWithDrawVO.getAdrCnclSeq() + +"' " //, String p_updateQuery + + ); //adr_hstry_mgr에 값 넣기 - 끝 + * UPDATE adr_rppl_chg + SET appr_yn = #apprYn#, + appr_de = NOW(), + last_updt_pnttm = NOW(), + last_updusr_id = #lastUpdusrId# + WHERE adr_seq = #adrSeq# + AND rppl_chg_seq = #rpplChgSeq# + */ } public AdjReqMgrOffLineVO resPonDentInfoPop(ApmVO apmVO) throws Exception{ 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 c0a8817d..0e937de3 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java @@ -192,6 +192,10 @@ public class ApmController { @Value("#{globalSettings['Globals.pdf.makepath.out']}") private String pdfMakepathOut; // /usr/local/tomcat/file/sht/out + //조정사건 이력관리 일련번호 + @Resource(name="adrHstryMgrSeqGnrService") + private EgovIdGnrService adrHstryMgrSeqGnrService; + // 실서버 개발서버 구분 private static String islocal; // /pdf/out/ @Value("#{globalSettings['Globals.prod.islocal']}") @@ -565,6 +569,7 @@ public class ApmController { String adrSn = cmmService.selectLastAdrSn(apmVO , "관리자>>P>사건정보" //String p_code_desc - CC199 , "V020" //String p_stat_cd + , "" ); apmVO.setAdrSn(adrSn); @@ -865,6 +870,7 @@ public class ApmController { int rs = adjstWithDrawService.insertAndUpdateAdjstWithDrawSave(adjstWithDrawVO , "조정진행관리>>조정진행목록>조정진행상세>사건문서>취하신청등록" //String p_code_desc - CC199 , "A300" //String p_stat_cd + , "" ); modelAndView.addObject("rs", (rs>0)); return modelAndView; @@ -883,7 +889,8 @@ public class ApmController { modelAndView.setViewName("jsonView"); int rs = adjstWithDrawService.deleteAdjstWithDraw(adjstWithDrawVO , "조정진행관리>>조정진행목록>조정진행상세>사건문서>취하신청등록-삭제" //String p_code_desc - CC199 - , "A310" //String p_stat_cd + , "A310" //String p_stat_cd + , "" ); modelAndView.addObject("rs", (rs>0)); return modelAndView; @@ -921,7 +928,8 @@ public class ApmController { /*rs = adjstWithDrawService.updateAdjstWithDrawSubmit(adjstWithDrawVO);*/ rs = adjstWithDrawService.insertAndUpdateAdjstWithDrawSave(adjstWithDrawVO , "조정진행관리>>조정진행목록>조정진행상세>사건문서>취하신청등록-제출" //String p_code_desc - CC199 - , "A320" //String p_stat_cd + , "A320" //String p_stat_cd + , "" ); if(rs > 0) { modelAndView.addObject("status", "success"); @@ -1095,7 +1103,8 @@ public class ApmController { //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 int rs = apmService.addRpplPopAjax(rpplVO , "조정진행관리>>조정진행목록>조정진행상세>P>대리인등록" //String p_code_desc - CC199 - , "A030" //String p_stat_cd + , "A030" //String p_stat_cd + , "" ); modelAndView.addObject("result", "success"); @@ -1329,6 +1338,12 @@ public class ApmController { /** * 조정접수시 당사자 및 당사자 대리인들에게 접속번호 부여 */ + + + //이력관리를 위한 adr_hstry_mgr_detail - 2022-09-07 controller #1 + String s_adrHstryMgrSeq = adrHstryMgrSeqGnrService.getNextStringId(); + + int rs = apmService.updateRegAdrNo(apmVO); if (rs > 0) { @@ -1337,7 +1352,9 @@ public class ApmController { arv.setStatCd(statCd); // 최종 변경 상태값 //arv.setLastUpdusrId(loginVO.getId()); // 최종 변경자 arv.setLastUpdusrId(loginVO.getUniqId()); // 최종 변경자 - kccadrMgrUdtService.updateAdrMgrUdt(arv); + kccadrMgrUdtService.updateAdrMgrUdt(arv + , s_adrHstryMgrSeq + ); } @@ -1509,7 +1526,8 @@ public class ApmController { //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 ansService.ansSubmitAjax(ansVO , "조정진행관리>>조정진행목록>조정진행상세>사건문서>P>문서등록" //String p_code_desc - CC199 - , "A160" //String p_stat_cd + , "A160" //String p_stat_cd + , "" ); result = "success"; @@ -1570,6 +1588,7 @@ public class ApmController { String adrSn = cmmService.selectLastAdrSn(apmVO , "관리자>>조정진행상세" //String p_code_desc - CC199 , "V010" //String p_stat_cd + , "" ); System.out.println("adrSn : "+ adrSn); 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 cfe59c84..6680f189 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/arm/web/ArmController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/arm/web/ArmController.java @@ -156,7 +156,8 @@ public class ArmController { //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 cmmService.insertCloseDoc(closeVO , "조정진행관리>>조정진행목록>조정진행상세>사건문서>조정권고안-등록" //String p_code_desc - CC199 - , "A460" //String p_stat_cd + , "A460" //String p_stat_cd + , "" ); @@ -381,6 +382,12 @@ public class ArmController { , "V490" //String p_stat_cd , result.getFrstRegisterId() , result.getLastUpdusrId() + + , "" + , "V" + , "ADR_MGR_MASTER" + , "" + ); //adr_hstry_mgr에 값 넣기 - 끝 diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/cfrm/web/CfrmController.java b/src/main/java/kcc/kccadr/adjPgrMgr/cfrm/web/CfrmController.java index 2a39b18c..13c243d5 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/cfrm/web/CfrmController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/cfrm/web/CfrmController.java @@ -105,7 +105,8 @@ public class CfrmController { //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 cmmService.insertCloseDoc(closeVO , "조정진행관리>>조정진행목록>조정진행상세>사건문서>확정증명원등록" //String p_code_desc - CC199 - , "A500" //String p_stat_cd + , "A500" //String p_stat_cd + , "" ); modelAndView.addObject("result", "success"); 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 96c63d90..3e2be025 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/PgrCmmService.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/PgrCmmService.java @@ -26,7 +26,8 @@ public interface PgrCmmService { void insertCloseDoc(CloseVO closeVO , String p_code_desc - , String p_stat_cd + , String p_stat_cd + , String p_adrHstryMgrSeq ) throws Exception; CmntVO selectCmntInfo(CmntVO cmntVO) throws Exception; @@ -50,7 +51,8 @@ public interface PgrCmmService { public String selectLastAdrSn( PgrCmmVO pgrCmmVO , String p_code_desc - , String p_stat_cd + , String p_stat_cd + , String p_adrHstryMgrSeq ) 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 c46b6cbd..34f4fdff 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 @@ -193,6 +193,7 @@ public class PgrCmmServiceImpl implements PgrCmmService { public void insertCloseDoc(CloseVO closeVO , String p_code_desc , String p_stat_cd + , String p_adrHstryMgrSeq ) throws FdlException, Exception { closeVO.setCloseDoc(idgenService.getNextStringId()); @@ -208,7 +209,18 @@ public class PgrCmmServiceImpl implements PgrCmmService { , p_stat_cd , closeVO.getFrstRegisterId() - , closeVO.getLastUpdusrId()); + , closeVO.getLastUpdusrId() + + , p_adrHstryMgrSeq //, String p_adrHstryMgrSeq + , "I" //, String p_useCd I/U/UI/II/RE + , "ADR_CLOSE_DOC" //, String p_tableName + , " WHERE 1=1 AND adr_seq='"+closeVO.getAdrSeq() + +" AND adr_sn='"+closeVO.getAdrSn() + +" AND close_doc_ty='"+closeVO.getCloseDocTy() + +" AND close_doc='"+closeVO.getCloseDoc() + +"' " //, String p_updateQuery + + ); //adr_hstry_mgr에 값 넣기 - 끝 } @@ -292,6 +304,7 @@ public class PgrCmmServiceImpl implements PgrCmmService { public String selectLastAdrSn(PgrCmmVO pgrCmmVO , String p_code_desc , String p_stat_cd + , String p_adrHstryMgrSeq ) throws Exception { String s_ret = pgrCmmDAO.selectLastAdrSn(pgrCmmVO); @@ -305,7 +318,14 @@ public class PgrCmmServiceImpl implements PgrCmmService { , p_stat_cd , pgrCmmVO.getFrstRegisterId() - , pgrCmmVO.getLastUpdusrId()); + , pgrCmmVO.getLastUpdusrId() + + , p_adrHstryMgrSeq //, String p_adrHstryMgrSeq + , "V" //, String p_useCd I/U/UI/II/RE + , "ADR_MGR_MASTER" //, String p_tableName + , "" //, String p_updateQuery + + ); //adr_hstry_mgr에 값 넣기 - 끝 return s_ret; diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/crt/web/CrtController.java b/src/main/java/kcc/kccadr/adjPgrMgr/crt/web/CrtController.java index e82ecc23..7a457bb3 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/crt/web/CrtController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/crt/web/CrtController.java @@ -140,7 +140,8 @@ public class CrtController { //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 cmmService.insertCloseDoc(closeVO , "조정진행관리>>조정진행목록>조정진행상세>사건문서>불성립종결통보서등록" //String p_code_desc - CC199 - , "A550" //String p_stat_cd + , "A550" //String p_stat_cd + , "" ); diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/dlvinfo/service/DlvinfoService.java b/src/main/java/kcc/kccadr/adjPgrMgr/dlvinfo/service/DlvinfoService.java index b7fdeff8..16a82bf2 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/dlvinfo/service/DlvinfoService.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/dlvinfo/service/DlvinfoService.java @@ -14,7 +14,8 @@ public interface DlvinfoService { public void insertAdjustDeliveryInfo(DlvinfoDetailVO dlvinfoDetailVO , String p_code_desc - , String p_stat_cd + , String p_stat_cd + , String p_adrHstryMgrSeq ) throws Exception; int deleteAdjustDeliveryInfo(DlvinfoVO dlvinfoVO) throws Exception; 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 7ee534e8..468f442a 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 @@ -67,7 +67,8 @@ public class DlvinfoServiceImpl implements DlvinfoService { @Override public void insertAdjustDeliveryInfo(DlvinfoDetailVO dlvinfoDetailVO , String p_code_desc - , String p_stat_cd + , String p_stat_cd + , String p_adrHstryMgrSeq ) throws Exception { String dlvrySeq = idgenService.getNextStringId(); // 고유ID dlvinfoDetailVO.setDlvrySeq(dlvrySeq); @@ -87,7 +88,17 @@ public class DlvinfoServiceImpl implements DlvinfoService { , p_stat_cd , dlvinfoDetailVO.getFrstRegisterId() - , dlvinfoDetailVO.getLastUpdusrId()); + , dlvinfoDetailVO.getLastUpdusrId() + + , p_adrHstryMgrSeq //, String p_adrHstryMgrSeq + , "I" //, String p_useCd I/U/UI/II/RE + , "ADR_DLVRY" //, String p_tableName + , " WHERE 1=1 AND adr_seq='"+dlvinfoDetailVO.getAdrSeq() + +"' AND adr_sn='"+dlvinfoDetailVO.getAdrSn() + +"' AND dlvry_seq='"+dlvinfoDetailVO.getDlvrySeq() + +"' " //, String p_updateQuery + + ); //adr_hstry_mgr에 값 넣기 - 끝 } 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 209ad0b4..0e85378f 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/dlvinfo/web/DlvinfoController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/dlvinfo/web/DlvinfoController.java @@ -403,7 +403,8 @@ public class DlvinfoController { //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 dlvinfoService.insertAdjustDeliveryInfo(dlvinfoDetailVO , "조정진행관리>>조정진행목록>조정진행상세>사건문서>송달정보등록" //String p_code_desc - CC199 - , "A260" //String p_stat_cd - 경정처리 + , "A260" //String p_stat_cd - 경정처리 + , "" ); modelAndView.addObject("result", "success"); 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 6e303aae..7eaf86d4 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/dnt/service/DntService.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/dnt/service/DntService.java @@ -12,18 +12,24 @@ public interface DntService { DntVO selectDateNotice(DntVO dntVO) throws Exception; - int udateDateNotice(DntVO dntVO) throws Exception; + int udateDateNotice(DntVO dntVO + , String p_code_desc + , String p_stat_cd + , String p_adrHstryMgrSeq + ) throws Exception; int insertDateNotice(DntVO dntVO , String p_code_desc - , String p_stat_cd + , String p_stat_cd + , String p_adrHstryMgrSeq ) throws Exception; int deleteDateNotice(DntVO dntVO); void updateDistribution(DntVO dntVO , String p_code_desc - , String p_stat_cd + , String p_stat_cd + , String p_adrHstryMgrSeq ) throws Exception; DntVO selectDateNoticeDate(DntVO dntVO) 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 6d6d01cc..4d928fb3 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 @@ -78,10 +78,35 @@ public class DntServiceImpl implements DntService { @Override - public int udateDateNotice(DntVO dntVO) throws Exception { + public int udateDateNotice(DntVO dntVO + , String p_code_desc + , String p_stat_cd + , String p_adrHstryMgrSeq + ) throws Exception { setDayNoticeInfo(dntVO); + + //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 + //adr_hstry_mgr에 값 넣기 - 시작 + adrHstryMgrDAO.insert4Func(dntVO.getAdrSeq() + //, "상태코드수정" + , p_code_desc + //, adjReqMgrVO.getStatCd() + , p_stat_cd + + , dntVO.getFrstRegisterId() + , dntVO.getLastUpdusrId() + + , p_adrHstryMgrSeq //, String p_adrHstryMgrSeq + , "U" //, String p_useCd I/U/UI/II/RE + , "ADR_APP_MGR" //, String p_tableName + , "" //, String p_updateQuery + + ); + //adr_hstry_mgr에 값 넣기 - 끝 + + return dntDAO.udateDateNotice(dntVO); } @@ -106,7 +131,8 @@ public class DntServiceImpl implements DntService { @Override public int insertDateNotice(DntVO dntVO , String p_code_desc - , String p_stat_cd + , String p_stat_cd + , String p_adrHstryMgrSeq ) throws Exception { setDayNoticeInfo(dntVO); @@ -122,7 +148,17 @@ public class DntServiceImpl implements DntService { , p_stat_cd , dntVO.getFrstRegisterId() - , dntVO.getLastUpdusrId()); + , dntVO.getLastUpdusrId() + + , p_adrHstryMgrSeq //, String p_adrHstryMgrSeq + , "I" //, String p_useCd I/U/UI/II/RE + , "ADR_APP_MGR" //, String p_tableName + , " WHERE 1=1 AND adr_seq='"+dntVO.getAdrSeq() + +"' AND adr_sn='"+dntVO.getAdrSn() + +"' AND app_seq='"+dntVO.getAppSeq() + +"' " //, String p_updateQuery + + ); //adr_hstry_mgr에 값 넣기 - 끝 @@ -148,7 +184,8 @@ public class DntServiceImpl implements DntService { @Override public void updateDistribution(DntVO dntVO , String p_code_desc - , String p_stat_cd + , String p_stat_cd + , String p_adrHstryMgrSeq ) throws Exception { @@ -171,7 +208,31 @@ public class DntServiceImpl implements DntService { , p_stat_cd , dntVO.getFrstRegisterId() - , dntVO.getLastUpdusrId()); + , dntVO.getLastUpdusrId() + + , p_adrHstryMgrSeq //, String p_adrHstryMgrSeq + , "I" //, String p_useCd I/U/UI/II/RE + , "adr_ass_hstry" //, String p_tableName + , " WHERE 1=1 AND ass_hstry_seq='"+dntVO.getAdrSeq() + +"' " //, String p_updateQuery + + ); + + adrHstryMgrDAO.insert4Func(dntVO.getAdrSeq() + //, "상태코드수정" + , p_code_desc + //, adjReqMgrVO.getStatCd() + , p_stat_cd + + , dntVO.getFrstRegisterId() + , dntVO.getLastUpdusrId() + + , p_adrHstryMgrSeq //, String p_adrHstryMgrSeq + , "U" //, String p_useCd I/U/UI/II/RE + , "ADR_ASS_MGR" //, String p_tableName + , "" //, String p_updateQuery + + ); //adr_hstry_mgr에 값 넣기 - 끝 } @@ -196,8 +257,32 @@ public class DntServiceImpl implements DntService { , p_stat_cd , dntVO.getFrstRegisterId() - , dntVO.getLastUpdusrId()); - //adr_hstry_mgr에 값 넣기 - 끝 + , dntVO.getLastUpdusrId() + + , p_adrHstryMgrSeq //, String p_adrHstryMgrSeq + , "I" //, String p_useCd I/U/UI/II/RE + , "adr_ass_hstry" //, String p_tableName + , " WHERE 1=1 AND ass_hstry_seq='"+dntVO.getAdrSeq() + +"' " //, String p_updateQuery + + ); + + adrHstryMgrDAO.insert4Func(dntVO.getAdrSeq() + //, "상태코드수정" + , p_code_desc + //, adjReqMgrVO.getStatCd() + , p_stat_cd + + , dntVO.getFrstRegisterId() + , dntVO.getLastUpdusrId() + + , p_adrHstryMgrSeq //, String p_adrHstryMgrSeq + , "U" //, String p_useCd I/U/UI/II/RE + , "ADR_ASS_MGR" //, String p_tableName + , "" //, String p_updateQuery + + ); + //adr_hstry_mgr에 값 넣기 - 끝 } @@ -220,8 +305,32 @@ public class DntServiceImpl implements DntService { , p_stat_cd , dntVO.getFrstRegisterId() - , dntVO.getLastUpdusrId()); - //adr_hstry_mgr에 값 넣기 - 끝 + , dntVO.getLastUpdusrId() + + , p_adrHstryMgrSeq //, String p_adrHstryMgrSeq + , "I" //, String p_useCd I/U/UI/II/RE + , "adr_ass_hstry" //, String p_tableName + , " WHERE 1=1 AND ass_hstry_seq='"+dntVO.getAdrSeq() + +"' " //, String p_updateQuery + + ); + + adrHstryMgrDAO.insert4Func(dntVO.getAdrSeq() + //, "상태코드수정" + , p_code_desc + //, adjReqMgrVO.getStatCd() + , p_stat_cd + + , dntVO.getFrstRegisterId() + , dntVO.getLastUpdusrId() + + , p_adrHstryMgrSeq //, String p_adrHstryMgrSeq + , "U" //, String p_useCd I/U/UI/II/RE + , "ADR_ASS_MGR" //, String p_tableName + , "" //, String p_updateQuery + + ); + //adr_hstry_mgr에 값 넣기 - 끝 } diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/dnt/web/DntController.java b/src/main/java/kcc/kccadr/adjPgrMgr/dnt/web/DntController.java index 06f28b3f..adf1a204 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/dnt/web/DntController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/dnt/web/DntController.java @@ -22,6 +22,7 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes; import com.fasterxml.jackson.core.io.JsonStringEncoder; +import egovframework.rte.fdl.idgnr.EgovIdGnrService; import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper; import kcc.com.cmm.LoginVO; import kcc.com.cmm.service.EgovCmmUseService; @@ -98,6 +99,10 @@ public class DntController { @Resource(name = "adrHstryMgrService") private AdrHstryMgrService adrHstryMgrService; + //조정사건 이력관리 일련번호 + @Resource(name="adrHstryMgrSeqGnrService") + private EgovIdGnrService adrHstryMgrSeqGnrService; + // 실서버 개발서버 구분 private static String islocal; // /pdf/out/ @Value("#{globalSettings['Globals.prod.islocal']}") @@ -170,13 +175,18 @@ public class DntController { } */ - dntService.udateDateNotice(dntVO); + dntService.udateDateNotice(dntVO + , "조정진행관리>>조정진행목록>조정진행상세>기일등록>조정기일지정-수정(장소/시간)" //String p_code_desc - CC199 + , "A125" //String p_stat_cd + , "" + ); //대석 등록 dntService.updateDistribution(dntVO , "조정진행관리>>조정진행목록>조정진행상세>기일등록>대석등록-수정" //String p_code_desc - CC199 - , "A130" //String p_stat_cd 대석등록-수정 + , "A130" //String p_stat_cd 대석등록-수정 + , "" ); /* AdjReqMgrVO arv = new AdjReqMgrVO(); @@ -312,14 +322,16 @@ public class DntController { //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 dntService.insertDateNotice(dntVO , "조정진행관리>>조정진행목록>조정진행상세>기일등록>조정기일지정" //String p_code_desc - CC199 - , "A120" //String p_stat_cd + , "A120" //String p_stat_cd + , "" ); //대석 등록 //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 dntService.updateDistribution(dntVO , "조정진행관리>>조정진행목록>조정진행상세>기일등록>대석등록-수정" //String p_code_desc - CC199 - , "A130" //String p_stat_cd 대석등록-수정 + , "A130" //String p_stat_cd 대석등록-수정 + , "" ); /* @@ -384,6 +396,11 @@ public class DntController { return modelAndView; } */ + + + //이력관리를 위한 adr_hstry_mgr_detail - 2022-09-07 controller #1 + String s_adrHstryMgrSeq = adrHstryMgrSeqGnrService.getNextStringId(); + //기일 정보 추가해주기 dntService.insertAddDateNotice(dntVO); @@ -394,7 +411,8 @@ public class DntController { //대석 등록 dntService.updateDistribution(dntVO , "조정진행관리>>조정진행목록>조정진행상세>기일등록>대석등록-수정" //String p_code_desc - CC199 - , "A130" //String p_stat_cd 대석등록-수정 + , "A130" //String p_stat_cd 대석등록-수정 + , s_adrHstryMgrSeq ); //사건 상태정보 업데이트 해주기 @@ -405,7 +423,9 @@ public class DntController { arv.setStatCd(KccadrConstants.ADR_APP_ADD); //최종 변경 상태값 arv.setLastUpdusrId(dntVO.getAdrAdmId()); //최종 변경자 - kccadrMgrUdtService.updateAdrMgrUdt(arv); + kccadrMgrUdtService.updateAdrMgrUdt(arv + , s_adrHstryMgrSeq + ); /* AdjReqMgrVO arv = new AdjReqMgrVO(); @@ -507,6 +527,12 @@ public class DntController { , "V140" //String p_stat_cd , result.getFrstRegisterId() , result.getLastUpdusrId() + + , "" + , "V" + , "ADR_MGR_MASTER" + , "" + ); //adr_hstry_mgr에 값 넣기 - 끝 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 a412c352..11528287 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/drt/service/DrtService.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/drt/service/DrtService.java @@ -7,15 +7,21 @@ public interface DrtService { int udateDateReport(DrtVO drtVO , String p_code_desc - , String p_stat_cd + , String p_stat_cd + , String p_adrHstryMgrSeq ) throws Exception; int insertDateReport(DrtVO drtVO , String p_code_desc - , String p_stat_cd + , String p_stat_cd + , String p_adrHstryMgrSeq ) throws Exception; - int deleteDateReport(DrtVO drtVO); + int deleteDateReport(DrtVO drtVO + , String p_code_desc + , String p_stat_cd + , String p_adrHstryMgrSeq + ) throws Exception; List selectAssRegList(DrtVO drtVO) throws Exception; @@ -25,7 +31,8 @@ public interface DrtService { int addAgntPopAjax(AgntVO agntVO , String p_code_desc - , String p_stat_cd + , String p_stat_cd + , String p_adrHstryMgrSeq ) 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 6317ef2d..fea2fcec 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 @@ -48,7 +48,8 @@ public class DrtServiceImpl implements DrtService { @Override public int udateDateReport(DrtVO drtVO , String p_code_desc - , String p_stat_cd + , String p_stat_cd + , String p_adrHstryMgrSeq ) throws Exception { setDayNoticeInfo(drtVO); // 02. 기일배석관리 ( 출석 여부 세팅) @@ -67,6 +68,31 @@ public class DrtServiceImpl implements DrtService { drtVO.setAssSeq(assArr[3]); drtDAO.udateDateReport02(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() + + , p_adrHstryMgrSeq //, String p_adrHstryMgrSeq + , "U" //, String p_useCd I/U/UI/II/RE + , "ADR_ASS_MGR" //, String p_tableName + , " WHERE 1=1 AND adr_seq='"+drtVO.getAdrSeq() + +"' AND adr_sn='"+drtVO.getAdrSn() + +"' AND ass_seq='"+drtVO.getAssSeq() + +"' " //, String p_updateQuery + + ); + //adr_hstry_mgr에 값 넣기 - 끝 + + } }catch(Exception e) { e.printStackTrace(); @@ -86,6 +112,31 @@ public class DrtServiceImpl implements DrtService { if(StringUtil.isNotEmpty(drtVO.getAgntSeq())) { log.debug(">>>>>>>>>>>.agnt:"+drtVO.getAgntSeq()+":"+drtVO.getAddYn()); drtDAO.udateDateReport02(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() + + , p_adrHstryMgrSeq //, String p_adrHstryMgrSeq + , "U" //, String p_useCd I/U/UI/II/RE + , "ADR_ASS_MGR" //, String p_tableName + , " WHERE 1=1 AND adr_seq='"+drtVO.getAdrSeq() + +"' AND adr_sn='"+drtVO.getAdrSn() + +"' AND ass_seq='"+drtVO.getAssSeq() + +"' " //, String p_updateQuery + + ); + //adr_hstry_mgr에 값 넣기 - 끝 + + } } }catch(Exception e) { @@ -105,7 +156,17 @@ public class DrtServiceImpl implements DrtService { , p_stat_cd , drtVO.getFrstRegisterId() - , drtVO.getLastUpdusrId()); + , drtVO.getLastUpdusrId() + + , p_adrHstryMgrSeq //, String p_adrHstryMgrSeq + , "U" //, String p_useCd I/U/UI/II/RE + , "ADR_PRTCL_MGR" //, String p_tableName + , " WHERE 1=1 AND adr_seq='"+drtVO.getAdrSeq() + +"' AND adr_sn='"+drtVO.getAdrSn() + +"' AND prtcl_seq='"+drtVO.getPrtclSeq() + +"' " //, String p_updateQuery + + ); //adr_hstry_mgr에 값 넣기 - 끝 return rs; @@ -115,7 +176,8 @@ public class DrtServiceImpl implements DrtService { @Override public int insertDateReport(DrtVO drtVO , String p_code_desc - , String p_stat_cd + , String p_stat_cd + , String p_adrHstryMgrSeq ) throws Exception { setDayNoticeInfo(drtVO); @@ -132,6 +194,27 @@ public class DrtServiceImpl implements DrtService { drtDAO.insertDateReport02(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() + + , p_adrHstryMgrSeq //, String p_adrHstryMgrSeq + , "I" //, String p_useCd I/U/UI/II/RE + , "ADR_ASS_MGR" //, String p_tableName + , " WHERE 1=1 AND adr_seq='"+drtVO.getAdrSeq() + +"' AND adr_sn='"+drtVO.getAdrSn() + +"' AND ass_seq='"+drtVO.getAssSeq() + +"' " //, String p_updateQuery + + ); + //adr_hstry_mgr에 값 넣기 - 끝 } @@ -150,6 +233,28 @@ public class DrtServiceImpl implements DrtService { log.debug(">>>>>>>>>>>.agnt:"+drtVO.getAgntSeq()+":"+drtVO.getAddYn()); drtDAO.insertDateReport02(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() + + , p_adrHstryMgrSeq //, String p_adrHstryMgrSeq + , "I" //, String p_useCd I/U/UI/II/RE + , "ADR_ASS_MGR" //, String p_tableName + , " WHERE 1=1 AND adr_seq='"+drtVO.getAdrSeq() + +"' AND adr_sn='"+drtVO.getAdrSn() + +"' AND ass_seq='"+drtVO.getAssSeq() + +"' " //, String p_updateQuery + + ); + //adr_hstry_mgr에 값 넣기 - 끝 + } } @@ -170,7 +275,17 @@ public class DrtServiceImpl implements DrtService { , p_stat_cd , drtVO.getFrstRegisterId() - , drtVO.getLastUpdusrId()); + , drtVO.getLastUpdusrId() + + , p_adrHstryMgrSeq //, String p_adrHstryMgrSeq + , "I" //, String p_useCd I/U/UI/II/RE + , "ADR_PRTCL_MGR" //, String p_tableName + , " WHERE 1=1 AND adr_seq='"+drtVO.getAdrSeq() + +"' AND adr_sn='"+drtVO.getAdrSn() + +"' AND prtcl_seq='"+drtVO.getPrtclSeq() + +"' " //, String p_updateQuery + + ); //adr_hstry_mgr에 값 넣기 - 끝 return 1; @@ -178,7 +293,11 @@ public class DrtServiceImpl implements DrtService { @Transactional @Override - public int deleteDateReport(DrtVO drtVO) { + public int deleteDateReport(DrtVO drtVO + , String p_code_desc + , String p_stat_cd + , String p_adrHstryMgrSeq + ) throws Exception { // 02. 기일배석관리 ( 출석 여부 세팅) String addUsrId[] = drtVO.getAddUsrIdList(); @@ -189,12 +308,53 @@ public class DrtServiceImpl implements DrtService { drtVO.setAssSeq(assArr[3]); drtDAO.deleteDateReport02(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() + + , p_adrHstryMgrSeq //, String p_adrHstryMgrSeq + , "D" //, String p_useCd I/U/UI/II/RE + , "ADR_ASS_MGR" //, String p_tableName + , "" //, String p_updateQuery + + ); + //adr_hstry_mgr에 값 넣기 - 끝 } drtDAO.deleteDateReport03(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() + + , p_adrHstryMgrSeq //, String p_adrHstryMgrSeq + , "D" //, String p_useCd I/U/UI/II/RE + , "ADR_PRTCL_MGR" //, String p_tableName + , "" //, String p_updateQuery + + ); + //adr_hstry_mgr에 값 넣기 - 끝 + + return 1; } @@ -273,6 +433,7 @@ public class DrtServiceImpl implements DrtService { public int addAgntPopAjax(AgntVO agntVO , String p_code_desc , String p_stat_cd + , String p_adrHstryMgrSeq ) throws Exception { agntVO.setAgntAddr(egovCryptoUtil.encrypt(agntVO.getAgntAddr())); @@ -300,7 +461,17 @@ public class DrtServiceImpl implements DrtService { , p_stat_cd , agntVO.getFrstRegisterId() - , agntVO.getLastUpdusrId()); + , agntVO.getLastUpdusrId() + + , p_adrHstryMgrSeq //, String p_adrHstryMgrSeq + , "U" //, String p_useCd I/U/UI/II/RE + , "ADR_AGNT_MGR" //, String p_tableName + , " WHERE 1=1 AND adr_seq='"+agntVO.getAdrSeq() + +"' AND adr_sn='"+agntVO.getAdrSn() + +"' AND agnt_seq='"+agntVO.getAgntSeq() + +"' " //, String p_updateQuery + + ); //adr_hstry_mgr에 값 넣기 - 끝 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 0c9ecb68..fca2a4b8 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/drt/web/DrtController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/drt/web/DrtController.java @@ -208,7 +208,8 @@ public class DrtController { int rs = drtService.addAgntPopAjax(agntVO , "사용자>>나의사건관리>조정진행 상황>조정진행 상세>조정대리신청-등록" //String p_code_desc - CC199 - , "A440" //String p_stat_cd + , "A440" //String p_stat_cd + , "" ); @@ -254,7 +255,8 @@ public class DrtController { //조정기일배석관리, 기일조서관리 drtService.insertDateReport(drtVO , "조정진행관리>>조정진행목록>조정진행상세>사건문서>기일조서등록" //String p_code_desc - CC199 - , "A390" //String p_stat_cd + , "A390" //String p_stat_cd + , "" ); @@ -338,7 +340,8 @@ public class DrtController { //기일조서수정 drtService.udateDateReport(drtVO , "조정진행관리>>조정진행목록>조정진행상세>사건문서>기일조서등록-수정" //String p_code_desc - CC199 - , "A400" //String p_stat_cd + , "A400" //String p_stat_cd + , "" ); //대석 등록 @@ -384,7 +387,11 @@ public class DrtController { ModelAndView modelAndView = new ModelAndView(); modelAndView.setViewName("jsonView"); - drtService.deleteDateReport(drtVO); + drtService.deleteDateReport(drtVO + , "조정진행관리>>조정진행목록>조정진행상세>사건문서>기일조서등록-삭제" //String p_code_desc - CC199 + , "A410" //String p_stat_cd + , "" + ); modelAndView.addObject("result", "success"); diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/drtctr/web/DrtCtrController.java b/src/main/java/kcc/kccadr/adjPgrMgr/drtctr/web/DrtCtrController.java index dc4cf34f..27901a2f 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/drtctr/web/DrtCtrController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/drtctr/web/DrtCtrController.java @@ -207,7 +207,8 @@ public class DrtCtrController { //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 cmmService.insertCloseDoc(closeVO , "조정진행관리>>조정진행목록>조정진행상세>사건문서>조정조서등록" //String p_code_desc - CC199 - , "A650" //String p_stat_cd + , "A650" //String p_stat_cd + , "" ); /* 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 14dac7f3..a6760ede 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/ent/web/EntController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/ent/web/EntController.java @@ -143,7 +143,8 @@ public class EntController { //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 cmmService.insertCloseDoc(closeVO , "조정진행관리>>조정진행목록>조정진행상세>사건문서>취하종결등록" //String p_code_desc - CC199 - , "A340" //String p_stat_cd + , "A340" //String p_stat_cd + , "" ); @@ -325,6 +326,12 @@ public class EntController { , "V380" //String p_stat_cd , result.getFrstRegisterId() , result.getLastUpdusrId() + + , "" + , "V" + , "ADR_MGR_MASTER" + , "" + ); //adr_hstry_mgr에 값 넣기 - 끝 diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/iam/web/InternalApprovManageController.java b/src/main/java/kcc/kccadr/adjPgrMgr/iam/web/InternalApprovManageController.java index 38399372..edc94259 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/iam/web/InternalApprovManageController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/iam/web/InternalApprovManageController.java @@ -23,6 +23,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.servlet.ModelAndView; +import egovframework.rte.fdl.idgnr.EgovIdGnrService; import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper; import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; import kcc.com.cmm.LoginVO; @@ -100,6 +101,10 @@ public class InternalApprovManageController { @Resource(name = "apmService") private ApmService apmService; + //조정사건 이력관리 일련번호 + @Resource(name="adrHstryMgrSeqGnrService") + private EgovIdGnrService adrHstryMgrSeqGnrService; + // 실서버 개발서버 구분 private static String islocal; // /pdf/out/ @Value("#{globalSettings['Globals.prod.islocal']}") @@ -344,6 +349,11 @@ public class InternalApprovManageController { return modelAndView; } + + //이력관리를 위한 adr_hstry_mgr_detail - 2022-09-07 controller #1 + String s_adrHstryMgrSeq = adrHstryMgrSeqGnrService.getNextStringId(); + + //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 int rs = internalApprovManageService.updateinternalApprovManageSave(internalApprovManageVO , "조정진행관리>>내부결재목록>조정결재상세>결재처리" //String p_code_desc - CC199 @@ -360,7 +370,9 @@ public class InternalApprovManageController { arv.setAdrSeq(internalApprovManageVO.getAdrSeq()); // 조정일련번호 arv.setStatCd(CmmUtil.getDynamicStatCd(internalApprovManageVO.getSbmtTy(), KccadrConstants.ADR_STAT_CRM)); // 최종 변경 상태값 arv.setLastUpdusrId(loginVO.getUniqId()); // 최종 변경자 - kccadrMgrUdtService.updateAdrMgrUdt(arv); + kccadrMgrUdtService.updateAdrMgrUdt(arv + , s_adrHstryMgrSeq + ); //최종요청인 경우는 400000 으로 한번더 요청 한다.(조정종결) if ( @@ -368,7 +380,9 @@ public class InternalApprovManageController { ) { //사건 종결인 경우는 바로 조정종결 처리를 한다. arv.setStatCd("400000"); // 최종 변경 상태값 - kccadrMgrUdtService.updateAdrMgrUdt(arv); + kccadrMgrUdtService.updateAdrMgrUdt(arv + , s_adrHstryMgrSeq + ); } }else if("Y".equals(statInfo.getRejectYn())){ @@ -376,7 +390,9 @@ public class InternalApprovManageController { arv.setAdrSeq(internalApprovManageVO.getAdrSeq()); // 조정일련번호 arv.setStatCd(CmmUtil.getDynamicStatCd(internalApprovManageVO.getSbmtTy(), KccadrConstants.ADR_STAT_RJT)); // 최종 변경 상태값 arv.setLastUpdusrId(loginVO.getUniqId()); // 최종 변경자 - kccadrMgrUdtService.updateAdrMgrUdt(arv); + kccadrMgrUdtService.updateAdrMgrUdt(arv + , s_adrHstryMgrSeq + ); } modelAndView.addObject("rs", (rs>0)); modelAndView.addObject("result", KccadrConstants.SUCCESS); diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/oad/web/OadController.java b/src/main/java/kcc/kccadr/adjPgrMgr/oad/web/OadController.java index ff22a506..3e18253b 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/oad/web/OadController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/oad/web/OadController.java @@ -149,7 +149,8 @@ public class OadController { //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 cmmService.insertCloseDoc(closeVO , "조정진행관리>>조정진행목록>조정진행상세>사건문서>직권조정결정서등록" //String p_code_desc - CC199 - , "A600" //String p_stat_cd + , "A600" //String p_stat_cd + , "" ); diff --git a/src/main/java/kcc/kccadr/adjReqMgrOff/service/impl/AdjReqMgrOffLineServiceImpl.java b/src/main/java/kcc/kccadr/adjReqMgrOff/service/impl/AdjReqMgrOffLineServiceImpl.java index 5a3305b0..cdeadd56 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrOff/service/impl/AdjReqMgrOffLineServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjReqMgrOff/service/impl/AdjReqMgrOffLineServiceImpl.java @@ -420,6 +420,12 @@ public String insertAdjReqMgrRpplReq(AdjReqMgrOffLineVO adjReqMgrOffLineVO) thro , adjReqMgrOffLineVO.getStatCd() , adjReqMgrOffLineVO.getFrstRegisterId() , adjReqMgrOffLineVO.getLastUpdusrId() + + , "" //, String p_adrHstryMgrSeq + , "U" //, String p_useCd I/U/UI/II/RE + , "ADR_MGR_MASTER" //, String p_tableName + , "" //, String p_updateQuery + ); //adr_hstry_mgr에 값 넣기 - 끝 diff --git a/src/main/java/kcc/kccadr/adjcclt/web/AdjstConciliatorController.java b/src/main/java/kcc/kccadr/adjcclt/web/AdjstConciliatorController.java index 1beb36b8..3f8aec76 100644 --- a/src/main/java/kcc/kccadr/adjcclt/web/AdjstConciliatorController.java +++ b/src/main/java/kcc/kccadr/adjcclt/web/AdjstConciliatorController.java @@ -24,6 +24,7 @@ import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.mvc.support.RedirectAttributes; +import egovframework.rte.fdl.idgnr.EgovIdGnrService; import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper; import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; import kcc.com.cmm.LoginVO; @@ -106,6 +107,10 @@ public class AdjstConciliatorController { @Resource(name="KccadrMgrUdtService") private KccadrMgrUdtService kccadrMgrUdtService; + //조정사건 이력관리 일련번호 + @Resource(name="adrHstryMgrSeqGnrService") + private EgovIdGnrService adrHstryMgrSeqGnrService; + /** * 조정위원 대시보드 화면 */ @@ -673,6 +678,12 @@ public class AdjstConciliatorController { modelAndView.addObject("message", s_process_check_result); return modelAndView; } + + + //이력관리를 위한 adr_hstry_mgr_detail - 2022-09-07 controller #1 + String s_adrHstryMgrSeq = adrHstryMgrSeqGnrService.getNextStringId(); + + int rs = adjstConciliatorService.updateConciliatorApmSave(adjstConciliatorVO); if(rs > 0 ){ // 결재 후 상태 조회 @@ -683,13 +694,17 @@ public class AdjstConciliatorController { arv.setAdrSeq(adjstConciliatorVO.getAdrSeq()); // 조정일련번호 arv.setStatCd(CmmUtil.getDynamicStatCd(adjstConciliatorVO.getSbmtTy(), KccadrConstants.ADR_STAT_CRM)); // 최종 변경 상태값 arv.setLastUpdusrId(loginVO.getUniqId()); // 최종 변경자 - kccadrMgrUdtService.updateAdrMgrUdt(arv); + kccadrMgrUdtService.updateAdrMgrUdt(arv + , s_adrHstryMgrSeq + ); }else if("Y".equals(statInfo.getRejectYn())){ AdjReqMgrVO arv = new AdjReqMgrVO(); arv.setAdrSeq(adjstConciliatorVO.getAdrSeq()); // 조정일련번호 arv.setStatCd(CmmUtil.getDynamicStatCd(adjstConciliatorVO.getSbmtTy(), KccadrConstants.ADR_STAT_RJT)); // 최종 변경 상태값 arv.setLastUpdusrId(loginVO.getUniqId()); // 최종 변경자 - kccadrMgrUdtService.updateAdrMgrUdt(arv); + kccadrMgrUdtService.updateAdrMgrUdt(arv + , s_adrHstryMgrSeq + ); } modelAndView.addObject("rs", (rs>0)); modelAndView.addObject("result", KccadrConstants.SUCCESS); diff --git a/src/main/java/kcc/kccadr/adjreqmgr/service/AdjReqMgrService.java b/src/main/java/kcc/kccadr/adjreqmgr/service/AdjReqMgrService.java index 50ddc4d5..992c0bec 100644 --- a/src/main/java/kcc/kccadr/adjreqmgr/service/AdjReqMgrService.java +++ b/src/main/java/kcc/kccadr/adjreqmgr/service/AdjReqMgrService.java @@ -30,8 +30,13 @@ public interface AdjReqMgrService { Integer updateAdjReqMgrRegSecurityStatusChange(AdjReqMgrVO searchVO) throws Exception; - Integer updateAdjReqMgrRegMasterStatusChange(AdjReqMgrVO searchVO) throws Exception; - - Integer updateAdjReqPaymentConfirm(AdjReqMgrVO searchVO) throws Exception; + Integer updateAdjReqMgrRegMasterStatusChange(AdjReqMgrVO searchVO + , String p_adrHstryMgrSeq + ) throws Exception; + Integer updateAdjReqPaymentConfirm(AdjReqMgrVO searchVO + , String p_code_desc + , String p_stat_cd + , String p_adrHstryMgrSeq + ) throws Exception; } diff --git a/src/main/java/kcc/kccadr/adjreqmgr/service/impl/AdjReqMgrDAO.java b/src/main/java/kcc/kccadr/adjreqmgr/service/impl/AdjReqMgrDAO.java index 7c15a07a..e783d0cb 100644 --- a/src/main/java/kcc/kccadr/adjreqmgr/service/impl/AdjReqMgrDAO.java +++ b/src/main/java/kcc/kccadr/adjreqmgr/service/impl/AdjReqMgrDAO.java @@ -97,6 +97,7 @@ public class AdjReqMgrDAO extends EgovAbstractDAO { } public int updateAdjReqPaymentConfirm(AdjReqMgrVO adjReqMgrVO) throws Exception { + //step2. return update("adjReqMgrDAO.updateAdjReqPaymentConfirm", adjReqMgrVO); } diff --git a/src/main/java/kcc/kccadr/adjreqmgr/service/impl/AdjReqMgrServiceImpl.java b/src/main/java/kcc/kccadr/adjreqmgr/service/impl/AdjReqMgrServiceImpl.java index 0b769b39..c6fd1de1 100644 --- a/src/main/java/kcc/kccadr/adjreqmgr/service/impl/AdjReqMgrServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjreqmgr/service/impl/AdjReqMgrServiceImpl.java @@ -40,7 +40,10 @@ public class AdjReqMgrServiceImpl extends EgovAbstractServiceImpl implements A @Resource(name = "adrHstryMgrDAO") private AdrHstryMgrDAO adrHstryMgrDAO; - + //조정사건 이력관리 일련번호 + @Resource(name="adrHstryMgrSeqGnrService") + private EgovIdGnrService adrHstryMgrSeqGnrService; + public String insertAdjReqMgrRpplReq(AdjReqMgrVO adjReqMgrVO) throws Exception{ @@ -259,15 +262,25 @@ public class AdjReqMgrServiceImpl extends EgovAbstractServiceImpl implements A } @Override - public Integer updateAdjReqMgrRegMasterStatusChange(AdjReqMgrVO searchVO) throws Exception { + public Integer updateAdjReqMgrRegMasterStatusChange(AdjReqMgrVO searchVO + , String p_adrHstryMgrSeq + ) throws Exception { int i_ret = adjReqMgrDAO.updateAdjReqMgrRegMasterStatusChange(searchVO); + //이력관리를 위한 adr_hstry_mgr_detail - 2022-09-07 serviceImpl #1 //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 //adr_hstry_mgr에 값 넣기 - 시작 adrHstryMgrDAO.insert4Func(searchVO.getAdrSeq(), "조정신청서 수정-관리자", searchVO.getStatCd() , searchVO.getFrstRegisterId() , searchVO.getLastUpdusrId() + + , p_adrHstryMgrSeq //, String p_adrHstryMgrSeq + , "U" //, String p_useCd I/U/UI/II/RE + , "ADR_APPR_MGR" //, String p_tableName + , " SET APPR_YN = 'N' WHERE 1=1 AND adr_seq='"+searchVO.getAdrSeq()+"' AND adr_sn='"+searchVO.getAdrSn()+"' " //, String p_updateQuery + + ); //adr_hstry_mgr에 값 넣기 - 끝 @@ -323,6 +336,11 @@ public class AdjReqMgrServiceImpl extends EgovAbstractServiceImpl implements A param.setFrstRegisterId(searchVO.getFrstRegisterId()); param.setLastUpdusrId(searchVO.getLastUpdusrId()); + + //이력관리를 위한 adr_hstry_mgr_detail - 2022-09-07 controller #1 + String s_adrHstryMgrSeq = adrHstryMgrSeqGnrService.getNextStringId(); + + // 결제내역 삭제... adjReqMgrDAO.deleteAdjstReqMgrPaymentList(param); @@ -334,7 +352,9 @@ public class AdjReqMgrServiceImpl extends EgovAbstractServiceImpl implements A arv.setAdrSeq(adrSeq); //조정일련번호 arv.setStatCd(searchVO.getStatCd()); //최종 변경 상태값 arv.setLastUpdusrId(searchVO.getLastUpdusrId()); //최종 변경자 - kccadrMgrUdtService.updateAdrMgrUdt(arv); + kccadrMgrUdtService.updateAdrMgrUdt(arv + , s_adrHstryMgrSeq + ); } for(AdjReqMgrVO model : searchVO.getPayment()){ @@ -352,12 +372,64 @@ public class AdjReqMgrServiceImpl extends EgovAbstractServiceImpl implements A } @Override - public Integer updateAdjReqPaymentConfirm(AdjReqMgrVO searchVO) throws Exception { + public Integer updateAdjReqPaymentConfirm(AdjReqMgrVO searchVO + , String p_code_desc + , String p_stat_cd + , String p_adrHstryMgrSeq + ) throws Exception { // 결제 테이블에 상태 변경 int rs = adjReqMgrDAO.updateAdjReqPaymentConfirm(searchVO); + + + //이력관리를 위한 adr_hstry_mgr_detail - 2022-09-07 serviceImpl #1 + //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 + //이력관리를 위한 adr_hstry_mgr_detail 데이터 관리 추가 - 2022-09-07 + //adr_hstry_mgr에 값 넣기 - 시작 + adrHstryMgrDAO.insert4Func(searchVO.getAdrSeq() + //, "상태코드수정" + , p_code_desc + //, adjReqMgrVO.getStatCd() + , p_stat_cd + + , searchVO.getFrstRegisterId() + , searchVO.getLastUpdusrId() + + , p_adrHstryMgrSeq //, String p_adrHstryMgrSeq + , "U" //, String p_useCd I/U/UI/II/RE + , "ADR_APPR_MGR" //, String p_tableName + , " SET APPR_YN = 'N' WHERE 1=1 AND adr_seq='"+searchVO.getAdrSeq()+"' AND adr_sn='"+searchVO.getAdrSn()+"' " //, String p_updateQuery + + ); + + //adr_hstry_mgr에 값 넣기 - 끝 + + if(rs > 0 ){ // 마스터 테이블에 조정비용, 조정비용납부여부 추가 rs += kccadrMgrUdtService.updatePaymentMasterProcess(searchVO); + + + //이력관리를 위한 adr_hstry_mgr_detail - 2022-09-07 serviceImpl #1 + //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 + //이력관리를 위한 adr_hstry_mgr_detail 데이터 관리 추가 - 2022-09-07 + //adr_hstry_mgr에 값 넣기 - 시작 + adrHstryMgrDAO.insert4Func(searchVO.getAdrSeq() + //, "상태코드수정" + , p_code_desc + //, adjReqMgrVO.getStatCd() + , p_stat_cd + + , searchVO.getFrstRegisterId() + , searchVO.getLastUpdusrId() + + , p_adrHstryMgrSeq //, String p_adrHstryMgrSeq + , "U" //, String p_useCd I/U/UI/II/RE + , "ADR_MGR_MASTER" //, String p_tableName + , " SET ADR_COST = '' ,ADR_PAY_YN = 'N' WHERE 1=1 AND adr_seq='"+searchVO.getAdrSeq()+"' " //, String p_updateQuery + + ); + //adr_hstry_mgr에 값 넣기 - 끝 + } return rs; } diff --git a/src/main/java/kcc/kccadr/adjreqmgr/web/AdjReqMgrController.java b/src/main/java/kcc/kccadr/adjreqmgr/web/AdjReqMgrController.java index 7da57098..860b105d 100644 --- a/src/main/java/kcc/kccadr/adjreqmgr/web/AdjReqMgrController.java +++ b/src/main/java/kcc/kccadr/adjreqmgr/web/AdjReqMgrController.java @@ -29,6 +29,7 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes; import com.fasterxml.jackson.core.io.JsonStringEncoder; +import egovframework.rte.fdl.idgnr.EgovIdGnrService; import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper; import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; import kcc.com.cmm.LoginVO; @@ -123,6 +124,9 @@ public class AdjReqMgrController { @Resource(name = "adrHstryMgrService") private AdrHstryMgrService adrHstryMgrService; + //조정사건 이력관리 일련번호 + @Resource(name="adrHstryMgrSeqGnrService") + private EgovIdGnrService adrHstryMgrSeqGnrService; // 실서버 개발서버 구분 private static String islocal; // /pdf/out/ @@ -434,6 +438,11 @@ public class AdjReqMgrController { return modelAndView; } + + //이력관리를 위한 adr_hstry_mgr_detail - 2022-09-07 controller #1 + String s_adrHstryMgrSeq = adrHstryMgrSeqGnrService.getNextStringId(); + + int rs = adjReqMgrService.updateAdjReqMgrRegSecurityStatusChange(adjReqMgrVO); if(rs > 0 ){ @@ -445,7 +454,9 @@ public class AdjReqMgrController { //arv.setAdrSn("1"); //조정회차(필수) 접수 및 기일되지 않았더라도 1회차로 전달 - kccadrMgrUdtService.updateAdrMgrUdt(arv); + kccadrMgrUdtService.updateAdrMgrUdt(arv + , s_adrHstryMgrSeq + ); } //승인일경우에만 마스터 테이블 상태 변경 처리.. @@ -473,7 +484,9 @@ public class AdjReqMgrController { adjReqMgrVO.setFrstRegisterId(userId); - int rs = adjReqMgrService.updateAdjReqMgrRegMasterStatusChange(adjReqMgrVO); + int rs = adjReqMgrService.updateAdjReqMgrRegMasterStatusChange(adjReqMgrVO + , "" + ); modelAndView.addObject("rs", rs); return modelAndView; } @@ -543,6 +556,12 @@ public class AdjReqMgrController { return modelAndView; } + + //step1.조정이력일련번호 - updateAdrMgrUdt와 세트 adr_hstry_mgr insert + //이력관리를 위한 adr_hstry_mgr_detail - 2022-09-07 controller #1 + String s_adrHstryMgrSeq = adrHstryMgrSeqGnrService.getNextStringId(); + + adjReqMgrService.insertAdjReqMgrRegPaymentSave(adjReqMgrVO); AdjReqMgrVO arv = new AdjReqMgrVO(); @@ -550,7 +569,9 @@ public class AdjReqMgrController { arv.setStatCd(statCd); //최종 변경 상태값 //arv.setLastUpdusrId(loginVO.getId()); //최종 변경자 arv.setLastUpdusrId(loginVO.getUniqId()); //최종 변경자 - kccadrMgrUdtService.updateAdrMgrUdt(arv); + kccadrMgrUdtService.updateAdrMgrUdt(arv + , s_adrHstryMgrSeq + ); modelAndView.addObject("result", "success"); return modelAndView; @@ -646,15 +667,33 @@ public class AdjReqMgrController { } // 결제 상세테이블 변경 // 결제 마스터 테이블 변경 - int rs = adjReqMgrService.updateAdjReqPaymentConfirm(adjReqMgrVO); - + + + //step1.조정이력일련번호 - updateAdrMgrUdt와 세트 adr_hstry_mgr insert + //이력관리를 위한 adr_hstry_mgr_detail - 2022-09-07 controller #1 + String s_adrHstryMgrSeq = adrHstryMgrSeqGnrService.getNextStringId(); + + + //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 + //이력관리를 위한 adr_hstry_mgr_detail - 2022-09-07 controller #3 + int rs = adjReqMgrService.updateAdjReqPaymentConfirm(adjReqMgrVO + , "관리자>>조정신청상세>납부처리" //String p_code_desc - CC199 + , "A005" //String p_stat_cd + , s_adrHstryMgrSeq //값이 있으면 detail에만 추가로 저장, 없으면 생성 후 사용(hstry, detail 추가 저장) + ); + if(rs > 0 ){ AdjReqMgrVO arv = new AdjReqMgrVO(); arv.setAdrSeq(adjReqMgrVO.getAdrSeq()); //조정일련번호 arv.setStatCd(statCd); //최종 변경 상태값 //arv.setLastUpdusrId(loginVO.getId()); //최종 변경자 arv.setLastUpdusrId(loginVO.getUniqId()); //최종 변경자 - kccadrMgrUdtService.updateAdrMgrUdt(arv); + + //이력관리를 위한 adr_hstry_mgr_detail - 2022-09-07 controller #2 + kccadrMgrUdtService.updateAdrMgrUdt(arv + , s_adrHstryMgrSeq + ); + } modelAndView.addObject("result", "success"); return modelAndView; @@ -882,6 +921,12 @@ public class AdjReqMgrController { , adjstReqVO.getStatCd() , userId , userId + + , "" + , "V" + , "ADR_MGR_MASTER" + , "" + ); //adr_hstry_mgr에 값 넣기 - 끝 diff --git a/src/main/java/kcc/kccadr/advc/service/AdrHstryMgrService.java b/src/main/java/kcc/kccadr/advc/service/AdrHstryMgrService.java index 17ca0fb0..0999a6d9 100644 --- a/src/main/java/kcc/kccadr/advc/service/AdrHstryMgrService.java +++ b/src/main/java/kcc/kccadr/advc/service/AdrHstryMgrService.java @@ -10,6 +10,12 @@ public interface AdrHstryMgrService { , String p_menuId , String p_frstRegisterId , String p_lastUpdusrId + + , String p_adrHstryMgrSeq + , String p_useCd + , String p_tableName + , String p_updateQuery + ) throws Exception; //C diff --git a/src/main/java/kcc/kccadr/advc/service/AdrHstryMgrVO.java b/src/main/java/kcc/kccadr/advc/service/AdrHstryMgrVO.java index e713745b..5ce3ca18 100644 --- a/src/main/java/kcc/kccadr/advc/service/AdrHstryMgrVO.java +++ b/src/main/java/kcc/kccadr/advc/service/AdrHstryMgrVO.java @@ -23,14 +23,21 @@ public class AdrHstryMgrVO extends ComDefaultVO implements Serializable { //detail private String adrHstryMgrDetailSeq; //조정사건이력관리상세일련번호 - private String tblNm; //대상테이블명 - private String adrSn; //조정회차 + private String useCd; //조정회차 + + + private String tableName; //대상테이블명 + + private String adrPk3; //대상테이블키값3 private String adrPk4; //대상테이블키값4 private String adrPk5; //대상테이블키값5 + private String updateQuery; //대상테이블키값5 + private String statCd; + //추가항목 private String codeNm; //코드명 @@ -87,11 +94,11 @@ public class AdrHstryMgrVO extends ComDefaultVO implements Serializable { public void setAdrHstryMgrDetailSeq(String adrHstryMgrDetailSeq) { this.adrHstryMgrDetailSeq = adrHstryMgrDetailSeq; } - public String getTblNm() { - return tblNm; + public String getTableName() { + return tableName; } - public void setTblNm(String tblNm) { - this.tblNm = tblNm; + public void setTableName(String tableName) { + this.tableName = tableName; } public String getAdrSn() { return adrSn; @@ -142,5 +149,22 @@ public class AdrHstryMgrVO extends ComDefaultVO implements Serializable { this.eCodeNm = eCodeNm; } - + public String getUseCd() { + return useCd; + } + public void setUseCd(String useCd) { + this.useCd = useCd; + } + public String getUpdateQuery() { + return updateQuery; + } + public void setUpdateQuery(String updateQuery) { + this.updateQuery = updateQuery; + } + public String getStatCd() { + return statCd; + } + public void setStatCd(String statCd) { + this.statCd = statCd; + } } diff --git a/src/main/java/kcc/kccadr/advc/service/impl/AdrHstryMgrDAO.java b/src/main/java/kcc/kccadr/advc/service/impl/AdrHstryMgrDAO.java index 9dee7a2d..7fdebf90 100644 --- a/src/main/java/kcc/kccadr/advc/service/impl/AdrHstryMgrDAO.java +++ b/src/main/java/kcc/kccadr/advc/service/impl/AdrHstryMgrDAO.java @@ -16,21 +16,27 @@ public class AdrHstryMgrDAO extends EgovAbstractDAO { //조정사건 이력관리 일련번호 @Resource(name="adrHstryMgrSeqGnrService") private EgovIdGnrService adrHstryMgrSeqGnrService; + + //조정사건 이력관리 일련번호 + @Resource(name="adrHstryMgrDetailSeqGnrService") + private EgovIdGnrService adrHstryMgrDetailSeqGnrService; /** * 등록 - C * @param AdjstChangeDateVO * @throws Exception */ - public String insert4Func( + public String insert4FuncMain( String p_adrSeq , String p_menuNm , String p_menuId , String p_frstRegisterId , String p_lastUpdusrId + , String s_adrHstryMgrSeq ) throws Exception { - String s_adrHstryMgrSeq = adrHstryMgrSeqGnrService.getNextStringId(); + //step1.조정이력일련번호 - adr_hstry_mgr insert + //String s_adrHstryMgrSeq = adrHstryMgrSeqGnrService.getNextStringId(); AdrHstryMgrVO adrHstryMgrVO = new AdrHstryMgrVO(); adrHstryMgrVO.setAdrSeq(p_adrSeq); @@ -46,9 +52,79 @@ public class AdrHstryMgrDAO extends EgovAbstractDAO { insert("AdrHstryMgrDAO.insert", adrHstryMgrVO); + + //step2.adr_mgr_master 에서 현재 stat_cd 가져오기 + AdrHstryMgrVO adrHstryMgrVOTmp = (AdrHstryMgrVO) select("AdrHstryMgrDetailDAO.selectDetailAdrMgrMaster", adrHstryMgrVO); + + + //step3.조정사건이력관리상세번호 - adr_hstry_mgr_detail insert + String s_adrHstryMgrDetailSeq = adrHstryMgrDetailSeqGnrService.getNextStringId(); + adrHstryMgrVO.setAdrHstryMgrDetailSeq(s_adrHstryMgrDetailSeq); + adrHstryMgrVO.setUseCd("U"); + adrHstryMgrVO.setTableName("adr_mgr_master"); + adrHstryMgrVO.setUpdateQuery(" SET stat_cd='"+adrHstryMgrVOTmp.getStatCd()+"' WHERE adr_seq='"+adrHstryMgrVO.getAdrSeq()+"' ") ; + + insert("AdrHstryMgrDetailDAO.insert", adrHstryMgrVO); + + return s_adrHstryMgrSeq; } + /** + * 등록 - C + * @param AdjstChangeDateVO + * @throws Exception + */ + public String insert4Func( + String p_adrSeq + , String p_menuNm + , String p_menuId + , String p_frstRegisterId + , String p_lastUpdusrId + , String p_adrHstryMgrSeq + , String p_useCd + , String p_tableName + , String p_updateQuery + ) throws Exception { + + //step1.조정이력일련번호 - adr_hstry_mgr insert + //String s_adrHstryMgrSeq = adrHstryMgrSeqGnrService.getNextStringId(); + + AdrHstryMgrVO adrHstryMgrVO = new AdrHstryMgrVO(); + + //개별 액션 단독 저장인 경우 + if ("".equals(p_adrHstryMgrSeq)) { + p_adrHstryMgrSeq = adrHstryMgrSeqGnrService.getNextStringId(); + + + adrHstryMgrVO.setAdrSeq(p_adrSeq); + adrHstryMgrVO.setMenuNm(p_menuNm); + adrHstryMgrVO.setMenuId(p_menuId); + if ("".equals(p_frstRegisterId) || p_frstRegisterId==null) { + adrHstryMgrVO.setFrstRegisterId(p_lastUpdusrId); + }else { + adrHstryMgrVO.setFrstRegisterId(p_frstRegisterId); + } + + adrHstryMgrVO.setAdrHstryMgrSeq(p_adrHstryMgrSeq); + + insert("AdrHstryMgrDAO.insert", adrHstryMgrVO); + + } + + //step2.조정사건이력관리상세번호 - adr_hstry_mgr_detail insert + String s_adrHstryMgrDetailSeq = adrHstryMgrDetailSeqGnrService.getNextStringId(); + adrHstryMgrVO.setAdrHstryMgrDetailSeq(s_adrHstryMgrDetailSeq); + adrHstryMgrVO.setUseCd(p_useCd); + adrHstryMgrVO.setTableName(p_tableName); + adrHstryMgrVO.setUpdateQuery(p_updateQuery) ; + + insert("AdrHstryMgrDetailDAO.insert", adrHstryMgrVO); + + + return p_adrHstryMgrSeq; + } + /** * 등록 - C * @param AdjstChangeDateVO diff --git a/src/main/java/kcc/kccadr/advc/service/impl/AdrHstryMgrServiceImpl.java b/src/main/java/kcc/kccadr/advc/service/impl/AdrHstryMgrServiceImpl.java index dee09dff..2551bb85 100644 --- a/src/main/java/kcc/kccadr/advc/service/impl/AdrHstryMgrServiceImpl.java +++ b/src/main/java/kcc/kccadr/advc/service/impl/AdrHstryMgrServiceImpl.java @@ -35,6 +35,11 @@ public class AdrHstryMgrServiceImpl implements AdrHstryMgrService { , String p_menuId , String p_frstRegisterId , String p_lastUpdusrId + + , String p_adrHstryMgrSeq + , String p_useCd + , String p_tableName + , String p_updateQuery ) throws Exception { return adrHstryMgrDAO.insert4Func( p_adrSeq @@ -42,9 +47,14 @@ public class AdrHstryMgrServiceImpl implements AdrHstryMgrService { , p_menuId , p_frstRegisterId , p_lastUpdusrId + + , p_adrHstryMgrSeq + , p_useCd + , p_tableName + , p_updateQuery ); } - + //C public void insert(AdrHstryMgrVO adrHstryMgrVO) throws Exception { adrHstryMgrDAO.insert(adrHstryMgrVO); diff --git a/src/main/java/kcc/kccadr/aprvl/service/AprvlMgrService.java b/src/main/java/kcc/kccadr/aprvl/service/AprvlMgrService.java index 1a05619a..8d3fe1d5 100644 --- a/src/main/java/kcc/kccadr/aprvl/service/AprvlMgrService.java +++ b/src/main/java/kcc/kccadr/aprvl/service/AprvlMgrService.java @@ -23,13 +23,15 @@ public interface AprvlMgrService { //조정사건결재저장 int insertAdrSbmtMgr(AprvlMgrVO aprvlMgrVO , String p_code_desc - , String p_stat_cd + , String p_stat_cd + , String p_adrHstryMgrSeq ) throws Exception; //조정사건결재 조정부 저장 int insertAdrSbmtDetailMgr(AprvlMgrVO aprvlMgrVO , String p_code_desc - , String p_stat_cd + , String p_stat_cd + , String p_adrHstryMgrSeq ) throws Exception; diff --git a/src/main/java/kcc/kccadr/aprvl/service/impl/AprvlMgrServiceImpl.java b/src/main/java/kcc/kccadr/aprvl/service/impl/AprvlMgrServiceImpl.java index b669302e..d44ad263 100644 --- a/src/main/java/kcc/kccadr/aprvl/service/impl/AprvlMgrServiceImpl.java +++ b/src/main/java/kcc/kccadr/aprvl/service/impl/AprvlMgrServiceImpl.java @@ -41,7 +41,8 @@ public class AprvlMgrServiceImpl extends EgovAbstractServiceImpl implements Apr //조종사건결재 public int insertAdrSbmtMgr(AprvlMgrVO aprvlMgrVO , String p_code_desc - , String p_stat_cd + , String p_stat_cd + , String p_adrHstryMgrSeq ) throws Exception { int rs = aprvlMgrDAO.insertAdrSbmtMgr(aprvlMgrVO); @@ -54,7 +55,14 @@ public class AprvlMgrServiceImpl extends EgovAbstractServiceImpl implements Apr , p_stat_cd , aprvlMgrVO.getFrstRegisterId() - , aprvlMgrVO.getLastUpdusrId()); + , aprvlMgrVO.getLastUpdusrId() + + , p_adrHstryMgrSeq //, String p_adrHstryMgrSeq + , "I" //, String p_useCd I/U/UI/II/RE + , "adr_sbmt_mgr" //, String p_tableName + , " WHERE 1=1 AND adr_seq='"+aprvlMgrVO.getAdrSeq()+"' AND adr_sn='"+aprvlMgrVO.getAdrSn()+"' AND sbmt_seq='"+aprvlMgrVO.getSbmtSeq()+"' " //, String p_updateQuery + + ); //adr_hstry_mgr에 값 넣기 - 끝 return rs; @@ -63,7 +71,8 @@ public class AprvlMgrServiceImpl extends EgovAbstractServiceImpl implements Apr //조정사건조정부 결재 public int insertAdrSbmtDetailMgr(AprvlMgrVO aprvlMgrVO , String p_code_desc - , String p_stat_cd + , String p_stat_cd + , String p_adrHstryMgrSeq ) throws Exception { //step1. 해당 조정사건결재에 조정부가 있는지 확인 @@ -80,7 +89,14 @@ public class AprvlMgrServiceImpl extends EgovAbstractServiceImpl implements Apr , p_stat_cd , aprvlMgrVO.getFrstRegisterId() - , aprvlMgrVO.getLastUpdusrId()); + , aprvlMgrVO.getLastUpdusrId() + + , p_adrHstryMgrSeq //, String p_adrHstryMgrSeq + , "I" //, String p_useCd I/U/UI/II/RE + , "adr_sbmt_detail_mgr" //, String p_tableName + , " WHERE 1=1 AND adr_seq='"+aprvlMgrVO.getAdrSeq()+"' AND adr_sn='"+aprvlMgrVO.getAdrSn()+"' AND sbmt_seq='"+aprvlMgrVO.getSbmtSeq()+"' " //, String p_updateQuery + + ); //adr_hstry_mgr에 값 넣기 - 끝 diff --git a/src/main/java/kcc/kccadr/aprvl/web/AprvlMgrController.java b/src/main/java/kcc/kccadr/aprvl/web/AprvlMgrController.java index 27690b9b..5b3a6ddf 100644 --- a/src/main/java/kcc/kccadr/aprvl/web/AprvlMgrController.java +++ b/src/main/java/kcc/kccadr/aprvl/web/AprvlMgrController.java @@ -9,6 +9,7 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; +import egovframework.rte.fdl.idgnr.EgovIdGnrService; import kcc.com.cmm.LoginVO; import kcc.com.cmm.service.EgovFileMngService; import kcc.com.utl.user.service.CheckLoginUtil; @@ -78,6 +79,9 @@ public class AprvlMgrController { @Resource(name="AdjstReqService") private AdjstReqService adjstReqService; + //조정사건 이력관리 일련번호 + @Resource(name="adrHstryMgrSeqGnrService") + private EgovIdGnrService adrHstryMgrSeqGnrService; //pdf 변환 서버 관련 설정 /* @@ -155,6 +159,10 @@ public class AprvlMgrController { } + //이력관리를 위한 adr_hstry_mgr_detail - 2022-09-07 controller #1 + String s_adrHstryMgrSeq = adrHstryMgrSeqGnrService.getNextStringId(); + + //step.2.조정사건결재에 저장======================================================================= int i = 0; //조정사건결재 추가 @@ -173,7 +181,8 @@ public class AprvlMgrController { //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 i = aprvlMgrService.insertAdrSbmtMgr(aprvlMgrVO , "조정진행관리>>조정진행목록>조정진행상세>결재요청" //String p_code_desc - CC199 - , "A070" //String p_stat_cd + , "A070" //String p_stat_cd + , s_adrHstryMgrSeq ); //조정부가 있는지 확인 하자. @@ -194,7 +203,8 @@ public class AprvlMgrController { //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 i = aprvlMgrService.insertAdrSbmtDetailMgr(aprvlMgrVO , "조정진행관리>>조정진행목록>조정진행상세>결재요청-조정부" //String p_code_desc - CC199 - , "A080" //String p_stat_cd + , "A080" //String p_stat_cd + , s_adrHstryMgrSeq ); } @@ -211,7 +221,9 @@ public class AprvlMgrController { - i = kccadrMgrUdtService.updateAdrMgrUdt(arv); + i = kccadrMgrUdtService.updateAdrMgrUdt(arv + , s_adrHstryMgrSeq + ); } @@ -277,7 +289,13 @@ public class AprvlMgrController { arv.setRefSeq2(aprvlMgrVO.getRefSeq2()); - i = kccadrMgrUdtService.updateAdrMgrUdt(arv); + //이력관리를 위한 adr_hstry_mgr_detail - 2022-09-07 controller #1 + String s_adrHstryMgrSeq = adrHstryMgrSeqGnrService.getNextStringId(); + + + i = kccadrMgrUdtService.updateAdrMgrUdt(arv + , s_adrHstryMgrSeq + ); } diff --git a/src/main/java/kcc/kccadr/cmm/service/impl/VbankServiceImpl.java b/src/main/java/kcc/kccadr/cmm/service/impl/VbankServiceImpl.java index 4bff73a2..2fafcef7 100644 --- a/src/main/java/kcc/kccadr/cmm/service/impl/VbankServiceImpl.java +++ b/src/main/java/kcc/kccadr/cmm/service/impl/VbankServiceImpl.java @@ -7,6 +7,7 @@ import javax.annotation.Resource; import org.springframework.stereotype.Service; +import egovframework.rte.fdl.idgnr.EgovIdGnrService; import kcc.com.utl.user.service.CheckAdrProcessUtil; import kcc.kccadr.accdnt.apm.service.AdjstPayMentVO; import kcc.kccadr.adjreqmgr.service.AdjReqMgrVO; @@ -32,6 +33,10 @@ public class VbankServiceImpl implements VbankService { @Resource(name="KccadrMgrUdtService") private KccadrMgrUdtService kccadrMgrUdtService; + //조정사건 이력관리 일련번호 + @Resource(name="adrHstryMgrSeqGnrService") + private EgovIdGnrService adrHstryMgrSeqGnrService; + // 가상계좌부여 public void updateVbankAcc(VbankVO vbankVO) throws Exception { for (AdjstPayMentVO vo : vbankVO.getPriceList()) { @@ -50,6 +55,11 @@ public class VbankServiceImpl implements VbankService { List adrList = vbankDAO.selectVbankNotiForAdr(vbankVO); // vbankVO.setAdrList(adrList); + + //이력관리를 위한 adr_hstry_mgr_detail - 2022-09-07 controller #1 + String s_adrHstryMgrSeq = adrHstryMgrSeqGnrService.getNextStringId(); + + int rs = vbankDAO.updateVbankNoti(vbankVO); // 결제 테이블 입금처리 if(rs > 0 ) { @@ -71,7 +81,9 @@ public class VbankServiceImpl implements VbankService { kccadrMgrUdtService.updatePaymentMasterProcess(adjReqMgrVO); // 조정마스터 입급처리 - kccadrMgrUdtService.updateAdrMgrUdt(adjReqMgrVO); + kccadrMgrUdtService.updateAdrMgrUdt(adjReqMgrVO + , s_adrHstryMgrSeq + ); } } } diff --git a/src/main/java/kcc/kccadr/kccadrCom/service/KccadrMgrUdtService.java b/src/main/java/kcc/kccadr/kccadrCom/service/KccadrMgrUdtService.java index ba8dd961..e09edd55 100644 --- a/src/main/java/kcc/kccadr/kccadrCom/service/KccadrMgrUdtService.java +++ b/src/main/java/kcc/kccadr/kccadrCom/service/KccadrMgrUdtService.java @@ -21,7 +21,9 @@ import kcc.kccadr.adjreqmgr.service.AdjReqMgrVO; public interface KccadrMgrUdtService { // 조정사건상태 업데이트 - public int updateAdrMgrUdt(AdjReqMgrVO adjReqMgrVO) throws Exception; + public int updateAdrMgrUdt(AdjReqMgrVO adjReqMgrVO + , String s_adrHstryMgrSeq + ) throws Exception; // 조정사건이력 등록 public void insertAdrHstry(AdjReqMgrVO adjReqMgrVO) throws Exception; diff --git a/src/main/java/kcc/kccadr/kccadrCom/service/impl/KccadrMgrUdtServiceImpl.java b/src/main/java/kcc/kccadr/kccadrCom/service/impl/KccadrMgrUdtServiceImpl.java index a44b08cb..7f66303a 100644 --- a/src/main/java/kcc/kccadr/kccadrCom/service/impl/KccadrMgrUdtServiceImpl.java +++ b/src/main/java/kcc/kccadr/kccadrCom/service/impl/KccadrMgrUdtServiceImpl.java @@ -54,17 +54,23 @@ public class KccadrMgrUdtServiceImpl implements KccadrMgrUdtService{ * @param adjReqMgrVO.statCd 조정사건상태(필수) */ @Override - public int updateAdrMgrUdt(AdjReqMgrVO adjReqMgrVO) throws Exception { - - int rs = _updateAdrMgrUdt(adjReqMgrVO); - + public int updateAdrMgrUdt(AdjReqMgrVO adjReqMgrVO + , String s_adrHstryMgrSeq + ) throws Exception { + //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 - //adr_hstry_mgr에 값 넣기 - 시작 - adrHstryMgrDAO.insert4Func(adjReqMgrVO.getAdrSeq(), "상태코드수정", adjReqMgrVO.getStatCd() + //adr_hstry_mgr에 값 넣기 - 시작 + //되돌리기를 위해서 adr_mgr_master 의 현재값으로 돌릴수 있는 쿼리를 adr_hstry_mgr_detail에 값을 넣고, adr_hstry_mgr에 바뀐값을 넣는다. + adrHstryMgrDAO.insert4FuncMain(adjReqMgrVO.getAdrSeq(), "상태코드수정", adjReqMgrVO.getStatCd() , adjReqMgrVO.getFrstRegisterId() - , adjReqMgrVO.getLastUpdusrId()); + , adjReqMgrVO.getLastUpdusrId() + , s_adrHstryMgrSeq + ); //adr_hstry_mgr에 값 넣기 - 끝 - + + + int rs = _updateAdrMgrUdt(adjReqMgrVO); + return rs; /* @@ -158,6 +164,8 @@ public class KccadrMgrUdtServiceImpl implements KccadrMgrUdtService{ @Override public int updatePaymentMasterProcess(AdjReqMgrVO adjReqMgrVO) throws Exception { + + //step2. return adjReqMgrDAO.updatePaymentMasterProcess(adjReqMgrVO); } diff --git a/src/main/resources/egovframework/egovProps/globals.properties b/src/main/resources/egovframework/egovProps/globals.properties index 67a3cbe3..3b2d8fec 100644 --- a/src/main/resources/egovframework/egovProps/globals.properties +++ b/src/main/resources/egovframework/egovProps/globals.properties @@ -34,7 +34,7 @@ Globals.DriverClassName=cubrid.jdbc.driver.CUBRIDDriver #Globals.Url=jdbc:cubrid:158.247.225.133:30000:kcc_adrs4:::?charset=utf8 #\uac1c\ubc1c\uc11c\ubc84 #Globals.Url=jdbc:cubrid:192.168.0.176:30000:cubdb:::?charset=utf8 -Globals.Url=jdbc:cubrid:192.168.0.176:30000:kcc_adr_advc:::?charset=utf8 +Globals.Url=jdbc:cubrid:119.193.215.98:30000:kcc_adr_advc:::?charset=utf8 #\uc2e4\uc11c\ubc84 #Globals.Url=jdbc:cubrid:192.168.39.14:30000:kcc_adrs4:::?charset=utf8 diff --git a/src/main/resources/egovframework/egovProps/globals_dev.properties b/src/main/resources/egovframework/egovProps/globals_dev.properties index 915b2f24..36fb1d53 100644 --- a/src/main/resources/egovframework/egovProps/globals_dev.properties +++ b/src/main/resources/egovframework/egovProps/globals_dev.properties @@ -21,8 +21,8 @@ Globals.LocalIp = 127.0.0.1 # DB\uc11c\ubc84 \ud0c0\uc785(mysql,oracle,altibase,tibero) - datasource \ubc0f sqlMap \ud30c\uc77c \uc9c0\uc815\uc5d0 \uc0ac\uc6a9\ub428 Globals.DbType = mysql -Globals.UserName= kccadrUr -Globals.Password= kccadr!@#$ +Globals.UserName= kccadradvcUr +Globals.Password= kccadradvc!@#$ # mysql #Globals.DriverClassName=net.sf.log4jdbc.DriverSpy @@ -33,7 +33,8 @@ Globals.DriverClassName=cubrid.jdbc.driver.CUBRIDDriver #\ud074\ub77c\uc6b0\ub4dc \uc11c\ubc84 #Globals.Url=jdbc:cubrid:158.247.225.133:30000:kcc_adrs4:::?charset=utf8 #\uac1c\ubc1c\uc11c\ubc84 -Globals.Url=jdbc:cubrid:219.240.88.15:30000:cubdb:::?charset=utf8 +#Globals.Url=jdbc:cubrid:219.240.88.15:30000:cubdb:::?charset=utf8 +Globals.Url=jdbc:cubrid:119.193.215.98:30000:kcc_adr_advc:::?charset=utf8 #\uc2e4\uc11c\ubc84 #Globals.Url=jdbc:cubrid:192.168.39.14:30000:kcc_adrs4:::?charset=utf8 diff --git a/src/main/resources/egovframework/egovProps/globals_local.properties b/src/main/resources/egovframework/egovProps/globals_local.properties index bbf6e930..92babf02 100644 --- a/src/main/resources/egovframework/egovProps/globals_local.properties +++ b/src/main/resources/egovframework/egovProps/globals_local.properties @@ -33,7 +33,8 @@ Globals.DriverClassName=cubrid.jdbc.driver.CUBRIDDriver #\ud074\ub77c\uc6b0\ub4dc \uc11c\ubc84 #Globals.Url=jdbc:cubrid:158.247.225.133:30000:kcc_adrs4:::?charset=utf8 #\uac1c\ubc1c\uc11c\ubc84 -Globals.Url=jdbc:cubrid:192.168.0.176:30000:cubdb:::?charset=utf8 +#Globals.Url=jdbc:cubrid:192.168.0.176:30000:cubdb:::?charset=utf8 +Globals.Url=jdbc:cubrid:119.193.215.98:30000:kcc_adr_advc:::?charset=utf8 #\uc2e4\uc11c\ubc84 #Globals.Url=jdbc:cubrid:192.168.39.14:30000:kcc_adrs4:::?charset=utf8 diff --git a/src/main/resources/egovframework/sqlmap/kccadr/advc/AdrHstryMgrDetail_SQL_Cubrid.xml b/src/main/resources/egovframework/sqlmap/kccadr/advc/AdrHstryMgrDetail_SQL_Cubrid.xml index ff73e685..b05e1644 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/advc/AdrHstryMgrDetail_SQL_Cubrid.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/advc/AdrHstryMgrDetail_SQL_Cubrid.xml @@ -16,11 +16,17 @@ adr_seq, adr_hstry_mgr_seq, adr_hstry_mgr_detail_seq, - tbl_nm, + adr_sn, - adr_pk3, - adr_pk4, - adr_pk5 + + use_cd, + + table_name, + + adr_pk_3, + adr_pk_4, + adr_pk_5, + update_query @@ -29,11 +35,14 @@ a.adr_seq AS adrSeq, a.adr_hstry_mgr_seq AS adrHstryMgrSeq, a.adr_hstry_mgr_detail_seq AS adrHstryMgrDetailSeq, - a.tbl_nm AS tblNm, a.adr_sn AS adrSn, - a.adr_pk3 AS adrPk3, - a.adr_pk4 AS adrPk4, - a.adr_pk5 AS adrPk5 + a.use_cd AS useCd, + a.table_name AS tableNm, + + a.adr_pk_3 AS adrPk3, + a.adr_pk_4 AS adrPk4, + a.adr_pk_5 AS adrPk5, + a.update_query AS updateQuery @@ -47,11 +56,14 @@ #adrSeq#, #adrHstryMgrSeq#, #adrHstryMgrDetailSeq#, - #tblNm#, #adrSn#, + #useCd#, + #tableName#, + #adrPk3#, #adrPk4#, - #adrPk5# + #adrPk5#, + #updateQuery# ) @@ -173,4 +185,13 @@ + + diff --git a/src/main/resources/egovframework/sqlmap/kccadr/advc/AdrHstryProcessDetail_SQL_Cubrid.xml b/src/main/resources/egovframework/sqlmap/kccadr/advc/AdrHstryProcessDetail_SQL_Cubrid.xml index 0e840417..166fbb1c 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/advc/AdrHstryProcessDetail_SQL_Cubrid.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/advc/AdrHstryProcessDetail_SQL_Cubrid.xml @@ -16,7 +16,7 @@ adr_seq, adr_hstry_mgr_seq, adr_hstry_mgr_detail_seq, - tbl_nm, + table_name, adr_sn, adr_pk3, adr_pk4, @@ -29,7 +29,7 @@ a.adr_seq AS adrSeq, a.adr_hstry_mgr_seq AS adrHstryMgrSeq, a.adr_hstry_mgr_detail_seq AS adrHstryMgrDetailSeq, - a.tbl_nm AS tblNm, + a.table_name AS tableName, a.adr_sn AS adrSn, a.adr_pk3 AS adrPk3, a.adr_pk4 AS adrPk4, @@ -47,7 +47,7 @@ #adrSeq#, #adrHstryMgrSeq#, #adrHstryMgrDetailSeq#, - #tblNm#, + #tableName#, #adrSn#, #adrPk3#, #adrPk4#, From 4041d7db4ed205dca947ea79916bb9663894b41c Mon Sep 17 00:00:00 2001 From: myname Date: Wed, 14 Sep 2022 15:40:07 +0900 Subject: [PATCH 12/12] =?UTF-8?q?2022-09-14=2015:39=20=EC=9D=B4=EB=A9=94?= =?UTF-8?q?=EC=9D=BC=20.=20=EA=B0=80=EB=8A=A5=ED=95=9C=20=ED=95=A8?= =?UTF-8?q?=EC=88=98=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/js/kccadr/kccadrCom.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/webapp/js/kccadr/kccadrCom.js b/src/main/webapp/js/kccadr/kccadrCom.js index 9af85640..a39a6a9e 100644 --- a/src/main/webapp/js/kccadr/kccadrCom.js +++ b/src/main/webapp/js/kccadr/kccadrCom.js @@ -365,6 +365,10 @@ function onlyAlphabetNumber(thisObj) { thisObj.value = thisObj.value.replace(/[^0-9a-zA-Z]/gi, ""); } +function onlyAlphabetNumberEmail(thisObj) { + thisObj.value = thisObj.value.replace(/[^0-9a-zA-Z\.]/gi, ""); +} + function getChkLen(name) { return $("input:checkbox[name=" + name + "]:checked").length; }