From 4544a169a7d4f4c01304fbc8325f3276de4503bf Mon Sep 17 00:00:00 2001 From: myname Date: Tue, 13 Sep 2022 14:43:31 +0900 Subject: [PATCH] =?UTF-8?q?2022-09-13=2014:43=20=EC=82=AC=EA=B1=B4=20?= =?UTF-8?q?=EC=9D=B4=EB=A0=A5=20=EA=B4=80=EB=A6=AC=20=EB=B0=8F=20=EB=90=98?= =?UTF-8?q?=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#,