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 e5b46150..1b99457c 100644 --- a/src/main/java/kcc/kccadr/accdnt/adr/service/AdjstDeputyReqService.java +++ b/src/main/java/kcc/kccadr/accdnt/adr/service/AdjstDeputyReqService.java @@ -5,13 +5,25 @@ import java.util.List; public interface AdjstDeputyReqService { List selectAdjstDeputyReqList(AdjstDeputyReqVO adjDeputyReqVO) throws Exception; - void insertAdjstDeputyReqSave(AdjstDeputyReqVO adjDeputyReqVO) throws Exception; + void insertAdjstDeputyReqSave(AdjstDeputyReqVO adjDeputyReqVO + , String p_code_desc + , String p_stat_cd + ) throws Exception; - int updateAdjstDeputyReqSave(AdjstDeputyReqVO adjDeputyReqVO) throws Exception; + int updateAdjstDeputyReqSave(AdjstDeputyReqVO adjDeputyReqVO + , String p_code_desc + , String p_stat_cd + ) throws Exception; - int updateAdjstDeputyReqStatus(AdjstDeputyReqVO adjDeputyReqVO) throws Exception; + int updateAdjstDeputyReqStatus(AdjstDeputyReqVO adjDeputyReqVO + , String p_code_desc + , String p_stat_cd + ) throws Exception; - int deleteAdjstDeputyReqInfo(AdjstDeputyReqVO adjDeputyReqVO) throws Exception; + int deleteAdjstDeputyReqInfo(AdjstDeputyReqVO adjDeputyReqVO + , String p_code_desc + , String p_stat_cd + ) 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 20598729..b65b6c34 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 @@ -1,13 +1,16 @@ package kcc.kccadr.accdnt.adr.service.impl; +import java.util.List; + +import javax.annotation.Resource; + +import org.springframework.stereotype.Service; + import egovframework.rte.fdl.idgnr.EgovIdGnrService; import kcc.kccadr.accdnt.adr.service.AdjstDeputyReqService; import kcc.kccadr.accdnt.adr.service.AdjstDeputyReqVO; +import kcc.kccadr.advc.service.impl.AdrHstryMgrDAO; import kcc.let.utl.fcc.service.EgovCryptoUtil; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import java.util.List; @Service("adjDeputyReqService") public class AdjstDeputyReqServiceImpl implements AdjstDeputyReqService { @@ -27,13 +30,20 @@ public class AdjstDeputyReqServiceImpl implements AdjstDeputyReqService { @Resource(name = "egovCryptoUtil") EgovCryptoUtil egovCryptoUtil; + // 조정사건이력관리 DAO + @Resource(name = "adrHstryMgrDAO") + private AdrHstryMgrDAO adrHstryMgrDAO; + @Override public List selectAdjstDeputyReqList(AdjstDeputyReqVO adjDeputyReqVO) throws Exception { return adjDeputyReqDAO.selectAdjstDeputyReqList(adjDeputyReqVO); } @Override - public void insertAdjstDeputyReqSave(AdjstDeputyReqVO adjDeputyReqVO) throws Exception { + public void insertAdjstDeputyReqSave(AdjstDeputyReqVO adjDeputyReqVO + , String p_code_desc + , String p_stat_cd + ) throws Exception { adjDeputyReqVO.setAgntSeq(agntGnrService.getNextStringId()); adjDeputyReqVO.setAgntNm(egovCryptoUtil.encrypt(adjDeputyReqVO.getAgntNm())); adjDeputyReqVO.setAgntAddr(egovCryptoUtil.encrypt(adjDeputyReqVO.getAgntAddr())); @@ -41,6 +51,20 @@ public class AdjstDeputyReqServiceImpl implements AdjstDeputyReqService { adjDeputyReqVO.setAgntPhone(egovCryptoUtil.encrypt(adjDeputyReqVO.getAgntPhone())); adjDeputyReqVO.setAgntCelnum(egovCryptoUtil.encrypt(adjDeputyReqVO.getAgntCelnum())); adjDeputyReqDAO.insertAdjstDeputyReqSave(adjDeputyReqVO); + + + //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 + //adr_hstry_mgr에 값 넣기 - 시작 + adrHstryMgrDAO.insert4Func(adjDeputyReqVO.getAdrSeq() + //, "상태코드수정" + , p_code_desc + //, adjReqMgrVO.getStatCd() + , p_stat_cd + + , adjDeputyReqVO.getFrstRegisterId() + , adjDeputyReqVO.getLastUpdusrId()); + //adr_hstry_mgr에 값 넣기 - 끝 + } @Override @@ -49,23 +73,79 @@ public class AdjstDeputyReqServiceImpl implements AdjstDeputyReqService { } @Override - public int updateAdjstDeputyReqSave(AdjstDeputyReqVO adjDeputyReqVO) throws Exception { + public int updateAdjstDeputyReqSave(AdjstDeputyReqVO adjDeputyReqVO + , String p_code_desc + , String p_stat_cd + ) throws Exception { adjDeputyReqVO.setAgntNm(egovCryptoUtil.encrypt(adjDeputyReqVO.getAgntNm())); adjDeputyReqVO.setAgntAddr(egovCryptoUtil.encrypt(adjDeputyReqVO.getAgntAddr())); adjDeputyReqVO.setAgntAddrDtl(egovCryptoUtil.encrypt(adjDeputyReqVO.getAgntAddrDtl())); adjDeputyReqVO.setAgntPhone(egovCryptoUtil.encrypt(adjDeputyReqVO.getAgntPhone())); adjDeputyReqVO.setAgntCelnum(egovCryptoUtil.encrypt(adjDeputyReqVO.getAgntCelnum())); - return adjDeputyReqDAO.updateAdjstDeputyReqSave(adjDeputyReqVO); + + int rs = adjDeputyReqDAO.updateAdjstDeputyReqSave(adjDeputyReqVO); + + + //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 + //adr_hstry_mgr에 값 넣기 - 시작 + adrHstryMgrDAO.insert4Func(adjDeputyReqVO.getAdrSeq() + //, "상태코드수정" + , p_code_desc + //, adjReqMgrVO.getStatCd() + , p_stat_cd + + , adjDeputyReqVO.getFrstRegisterId() + , adjDeputyReqVO.getLastUpdusrId()); + //adr_hstry_mgr에 값 넣기 - 끝 + + return rs; } @Override - public int updateAdjstDeputyReqStatus(AdjstDeputyReqVO adjDeputyReqVO) throws Exception { - return adjDeputyReqDAO.updateAdjstDeputyReqStatus(adjDeputyReqVO); + public int updateAdjstDeputyReqStatus(AdjstDeputyReqVO adjDeputyReqVO + , String p_code_desc + , String p_stat_cd + ) throws Exception { + int rs = adjDeputyReqDAO.updateAdjstDeputyReqStatus(adjDeputyReqVO); + + + //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 + //adr_hstry_mgr에 값 넣기 - 시작 + adrHstryMgrDAO.insert4Func(adjDeputyReqVO.getAdrSeq() + //, "상태코드수정" + , p_code_desc + //, adjReqMgrVO.getStatCd() + , p_stat_cd + + , adjDeputyReqVO.getFrstRegisterId() + , adjDeputyReqVO.getLastUpdusrId()); + //adr_hstry_mgr에 값 넣기 - 끝 + + + return rs; } @Override - public int deleteAdjstDeputyReqInfo(AdjstDeputyReqVO adjDeputyReqVO) throws Exception { - return adjDeputyReqDAO.deleteAdjstDeputyReqInfo(adjDeputyReqVO); + public int deleteAdjstDeputyReqInfo(AdjstDeputyReqVO adjDeputyReqVO + , String p_code_desc + , String p_stat_cd + ) throws Exception { + int rs = adjDeputyReqDAO.deleteAdjstDeputyReqInfo(adjDeputyReqVO); + + + //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 + //adr_hstry_mgr에 값 넣기 - 시작 + adrHstryMgrDAO.insert4Func(adjDeputyReqVO.getAdrSeq() + //, "상태코드수정" + , p_code_desc + //, adjReqMgrVO.getStatCd() + , p_stat_cd + + , adjDeputyReqVO.getFrstRegisterId() + , adjDeputyReqVO.getLastUpdusrId()); + //adr_hstry_mgr에 값 넣기 - 끝 + + return rs; } @Override 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 481b914d..b7bda030 100644 --- a/src/main/java/kcc/kccadr/accdnt/adr/web/AdjstDeputyReqWebController.java +++ b/src/main/java/kcc/kccadr/accdnt/adr/web/AdjstDeputyReqWebController.java @@ -1,17 +1,11 @@ package kcc.kccadr.accdnt.adr.web; -import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper; -import kcc.com.cmm.LoginVO; -import kcc.com.cmm.service.EgovFileMngService; -import kcc.com.cmm.service.EgovFileMngUtil; -import kcc.com.cmm.service.FileVO; -import kcc.com.utl.fcc.service.EgovStringUtil; -import kcc.kccadr.accdnt.adr.service.AdjstDeputyReqService; -import kcc.kccadr.accdnt.adr.service.AdjstDeputyReqVO; -import kcc.kccadr.accdnt.ai.service.AdjstIncidentVO; -import kcc.kccadr.accdnt.crtfc.service.CrtfcService; -import kcc.let.uss.umt.service.MberManageVO; -import kcc.let.utl.fcc.service.EgovCryptoUtil; +import java.util.List; +import java.util.Map; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; + import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @@ -24,10 +18,16 @@ import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import java.util.List; -import java.util.Map; +import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper; +import kcc.com.cmm.LoginVO; +import kcc.com.cmm.service.EgovFileMngService; +import kcc.com.cmm.service.EgovFileMngUtil; +import kcc.com.cmm.service.FileVO; +import kcc.com.utl.fcc.service.EgovStringUtil; +import kcc.kccadr.accdnt.adr.service.AdjstDeputyReqService; +import kcc.kccadr.accdnt.adr.service.AdjstDeputyReqVO; +import kcc.kccadr.accdnt.crtfc.service.CrtfcService; +import kcc.let.utl.fcc.service.EgovCryptoUtil; /** * 대국민(사용자) @@ -149,9 +149,18 @@ public class AdjstDeputyReqWebController { adjDeputyReqVO.setRpplSeq(rpplInfo.getRpplSeq()); } if("I".equalsIgnoreCase(adjDeputyReqVO.getMode())){ - adjDeputyReqService.insertAdjstDeputyReqSave(adjDeputyReqVO); + //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 + adjDeputyReqService.insertAdjstDeputyReqSave(adjDeputyReqVO + , "사용자>>나의사건관리>조정진행 상황>조정진행 상세>조정대리신청-등록" //String p_code_desc - CC199 + , "C170" //String p_stat_cd + ); + } else if("U".equalsIgnoreCase(adjDeputyReqVO.getMode())) { - adjDeputyReqService.updateAdjstDeputyReqSave(adjDeputyReqVO); + //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 + adjDeputyReqService.updateAdjstDeputyReqSave(adjDeputyReqVO + , "사용자>>나의사건관리>조정진행 상황>조정진행 상세>조정대리신청-수정" //String p_code_desc - CC199 + , "C180" //String p_stat_cd + ); } @@ -220,7 +229,11 @@ public class AdjstDeputyReqWebController { int rs = 0; try { - rs = adjDeputyReqService.updateAdjstDeputyReqStatus(adjDeputyReqVO); + //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 + rs = adjDeputyReqService.updateAdjstDeputyReqStatus(adjDeputyReqVO + , "사용자>>나의사건관리>조정진행 상황>조정진행 상세>조정대리신청-제출" //String p_code_desc - CC199 + , "C200" //String p_stat_cd + ); if(rs > 0) { modelAndView.addObject("result", rs); @@ -245,7 +258,12 @@ public class AdjstDeputyReqWebController { public ModelAndView adjstDeputyReqDelete( HttpServletRequest request , AdjstDeputyReqVO adjDeputyReqVO ) throws Exception { ModelAndView modelAndView = new ModelAndView(); modelAndView.setViewName("jsonView"); - int rs = adjDeputyReqService.deleteAdjstDeputyReqInfo(adjDeputyReqVO); + + //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 + int rs = adjDeputyReqService.deleteAdjstDeputyReqInfo(adjDeputyReqVO + , "사용자>>나의사건관리>조정진행 상황>조정진행 상세>조정대리신청-삭제" //String p_code_desc - CC199 + , "C190" //String p_stat_cd + ); modelAndView.addObject("result", rs); return modelAndView; } 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 ce133855..b705e93c 100644 --- a/src/main/java/kcc/kccadr/accdnt/ans/web/AnsController.java +++ b/src/main/java/kcc/kccadr/accdnt/ans/web/AnsController.java @@ -110,8 +110,9 @@ public class AnsController { ansVO.setFrstRegisterId(userId); ansVO.setLastUpdusrId(userId); + //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 ansService.ansSubmitAjax(ansVO - , "사용자>>나의사건관리>조정진행 상황>답변서제출" //String p_code_desc - CC199 + , "사용자>>나의사건관리>조정진행 상황>조정진행 상세>답변서제출" //String p_code_desc - CC199 , "C150" //String p_stat_cd ); 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 c8e74b6c..a894f7ad 100644 --- a/src/main/java/kcc/kccadr/accdnt/arc/service/CorReqService.java +++ b/src/main/java/kcc/kccadr/accdnt/arc/service/CorReqService.java @@ -11,10 +11,22 @@ public interface CorReqService { List selectRpplList(CorReqVO corReqVO) throws Exception; - int corReqCreateAjax(CorReqVO corReqVO, CorReqArrayVO corArrReqVO) throws Exception; - int corReqDelAjax(CorReqVO corReqVO) throws Exception; - int corReqUpdAjax(CorReqVO corReqVO, CorReqArrayVO corReqArrayVO) throws Exception; - int corReqAppAjax(CorReqVO corReqVO) throws Exception; + int corReqCreateAjax(CorReqVO corReqVO, CorReqArrayVO corArrReqVO + , String p_code_desc + , String p_stat_cd + ) throws Exception; + int corReqDelAjax(CorReqVO corReqVO + , String p_code_desc + , String p_stat_cd + ) throws Exception; + int corReqUpdAjax(CorReqVO corReqVO, CorReqArrayVO corReqArrayVO + , String p_code_desc + , String p_stat_cd + ) throws Exception; + int corReqAppAjax(CorReqVO corReqVO + , String p_code_desc + , String p_stat_cd + ) 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 18eb8e82..f0640992 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 @@ -14,6 +14,7 @@ import kcc.kccadr.accdnt.arc.service.CorReqArrayVO; import kcc.kccadr.accdnt.arc.service.CorReqService; import kcc.kccadr.accdnt.arc.service.CorReqVO; import kcc.kccadr.adjPgrMgr.cclt.service.ConciliatorManageVO; +import kcc.kccadr.advc.service.impl.AdrHstryMgrDAO; import kcc.kccadr.cmm.KccadrConstants; import kcc.let.utl.fcc.service.EgovCryptoUtil; @@ -34,7 +35,10 @@ public class CorReqServiceImpl implements CorReqService { @Resource(name = "apmCorDetSeqGnrService") private EgovIdGnrService rpplChgDetailIdgenService; - + // 조정사건이력관리 DAO + @Resource(name = "adrHstryMgrDAO") + private AdrHstryMgrDAO adrHstryMgrDAO; + @Override public List selectCorReqList(CorReqVO corReqVO) throws Exception { List list = corReqDAO.selectCorReqList(corReqVO); @@ -185,7 +189,10 @@ public class CorReqServiceImpl implements CorReqService { } @Override - public int corReqCreateAjax(CorReqVO corReqVO, CorReqArrayVO corArrReqVO) throws Exception { + public int corReqCreateAjax(CorReqVO corReqVO, CorReqArrayVO corArrReqVO + , String p_code_desc + , String p_stat_cd + ) throws Exception { /*encpyptVo(corReqVO); corReqDAO.corReqCreateAjax_step1(corReqVO); corReqDAO.corReqCreateAjax_step2(corReqVO);*/ @@ -208,6 +215,18 @@ public class CorReqServiceImpl implements CorReqService { corReqVO.setRpplSeq(corArrReqVO.getRpplSeq_0()); encpyptVo(corReqVO); corReqDAO.corReqCreateAjax_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()); + //adr_hstry_mgr에 값 넣기 - 끝 } if (StringUtil.isNotEmpty(corArrReqVO.getOldRpplSeq_1())) { @@ -224,6 +243,18 @@ public class CorReqServiceImpl implements CorReqService { corReqVO.setRpplSeq(corArrReqVO.getRpplSeq_1()); encpyptVo(corReqVO); corReqDAO.corReqCreateAjax_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()); + //adr_hstry_mgr에 값 넣기 - 끝 } if (StringUtil.isNotEmpty(corArrReqVO.getOldRpplSeq_2())) { @@ -240,6 +271,18 @@ public class CorReqServiceImpl implements CorReqService { corReqVO.setRpplSeq(corArrReqVO.getRpplSeq_2()); encpyptVo(corReqVO); corReqDAO.corReqCreateAjax_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()); + //adr_hstry_mgr에 값 넣기 - 끝 } if (StringUtil.isNotEmpty(corArrReqVO.getOldRpplSeq_3())) { @@ -256,6 +299,18 @@ public class CorReqServiceImpl implements CorReqService { corReqVO.setRpplSeq(corArrReqVO.getRpplSeq_3()); encpyptVo(corReqVO); corReqDAO.corReqCreateAjax_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()); + //adr_hstry_mgr에 값 넣기 - 끝 } if (StringUtil.isNotEmpty(corArrReqVO.getOldRpplSeq_4())) { @@ -272,6 +327,18 @@ public class CorReqServiceImpl implements CorReqService { corReqVO.setRpplSeq(corArrReqVO.getRpplSeq_4()); encpyptVo(corReqVO); corReqDAO.corReqCreateAjax_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()); + //adr_hstry_mgr에 값 넣기 - 끝 } @@ -279,22 +346,57 @@ public class CorReqServiceImpl implements CorReqService { } @Override - public int corReqAppAjax(CorReqVO corReqVO) throws Exception { + public int corReqAppAjax(CorReqVO corReqVO + , String p_code_desc + , String p_stat_cd + ) throws Exception { corReqVO.setApprYn(KccadrConstants.ADR_CNCL_RULER_REQ); // 피신청인경정신청 corReqDAO.corReqAppAjax_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()); + //adr_hstry_mgr에 값 넣기 - 끝 + return 0; } @Override - public int corReqDelAjax(CorReqVO corReqVO) throws Exception { + public int corReqDelAjax(CorReqVO corReqVO + , String p_code_desc + , String p_stat_cd + ) throws Exception { corReqDAO.corReqDelAjax_step1(corReqVO); 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()); + //adr_hstry_mgr에 값 넣기 - 끝 + return 0; } @Override - public int corReqUpdAjax(CorReqVO corReqVO, CorReqArrayVO corArrReqVO) throws Exception { + public int corReqUpdAjax(CorReqVO corReqVO, CorReqArrayVO corArrReqVO + , String p_code_desc + , String p_stat_cd + ) throws Exception { /*encpyptVo(corReqVO); corReqDAO.corReqUpdAjax_step1(corReqVO); corReqDAO.corReqUpdAjax_step2(corReqVO);*/ @@ -312,6 +414,18 @@ public class CorReqServiceImpl implements CorReqService { corReqVO.setRpplEmail(corArrReqVO.getRpplEmail_0()); encpyptVo(corReqVO); corReqDAO.corReqUpdAjax_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()); + //adr_hstry_mgr에 값 넣기 - 끝 } if (StringUtil.isNotEmpty(corArrReqVO.getOldRpplSeq_1())) { @@ -327,6 +441,18 @@ public class CorReqServiceImpl implements CorReqService { corReqVO.setRpplEmail(corArrReqVO.getRpplEmail_1()); encpyptVo(corReqVO); corReqDAO.corReqUpdAjax_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()); + //adr_hstry_mgr에 값 넣기 - 끝 } if (StringUtil.isNotEmpty(corArrReqVO.getOldRpplSeq_2())) { @@ -342,6 +468,18 @@ public class CorReqServiceImpl implements CorReqService { corReqVO.setRpplEmail(corArrReqVO.getRpplEmail_2()); encpyptVo(corReqVO); corReqDAO.corReqUpdAjax_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()); + //adr_hstry_mgr에 값 넣기 - 끝 } if (StringUtil.isNotEmpty(corArrReqVO.getOldRpplSeq_3())) { @@ -357,6 +495,18 @@ public class CorReqServiceImpl implements CorReqService { corReqVO.setRpplEmail(corArrReqVO.getRpplEmail_3()); encpyptVo(corReqVO); corReqDAO.corReqUpdAjax_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()); + //adr_hstry_mgr에 값 넣기 - 끝 } if (StringUtil.isNotEmpty(corArrReqVO.getOldRpplSeq_4())) { @@ -372,6 +522,18 @@ public class CorReqServiceImpl implements CorReqService { corReqVO.setRpplEmail(corArrReqVO.getRpplEmail_4()); encpyptVo(corReqVO); corReqDAO.corReqUpdAjax_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()); + //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 54c4d52f..4fc82575 100644 --- a/src/main/java/kcc/kccadr/accdnt/arc/web/CorReqController.java +++ b/src/main/java/kcc/kccadr/accdnt/arc/web/CorReqController.java @@ -1,12 +1,9 @@ package kcc.kccadr.accdnt.arc.web; -import java.util.ArrayList; import java.util.List; import javax.annotation.Resource; -import org.apache.commons.lang3.StringUtils; -import org.jsoup.select.Evaluator.IsEmpty; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Controller; @@ -30,7 +27,6 @@ import kcc.kccadr.adjPgrMgr.apm.service.ApmService; import kcc.kccadr.adjPgrMgr.cmm.service.CloseVO; import kcc.kccadr.adjPgrMgr.cmm.service.PgrCmmService; import kcc.kccadr.adjPgrMgr.cmm.service.PgrCmmVO; -import kcc.let.uss.umt.service.MberManageVO; /** * 대국민(사용자) 조정사건 관한 controller 클래스를 정의한다. @@ -291,7 +287,11 @@ public class CorReqController { corReqVO.setLastUpdusrId(userId); /*corReqVO.setRpplChgSeq(rppIdgenService.getNextStringId());*/ - corReqService.corReqCreateAjax(corReqVO, corArrReqVO); + //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 + corReqService.corReqCreateAjax(corReqVO, corArrReqVO + , "사용자>>나의사건관리>조정진행 상황>조정진행 상세>경정신청-등록" //String p_code_desc - CC199 + , "C210" //String p_stat_cd + ); modelAndView.addObject("result", "success"); @@ -324,7 +324,10 @@ public class CorReqController { corReqVO.setLastUpdusrId(userId); - corReqService.corReqUpdAjax(corReqVO, corReqArrayVO); + corReqService.corReqUpdAjax(corReqVO, corReqArrayVO + , "사용자>>나의사건관리>조정진행 상황>조정진행 상세>경정신청-수정" //String p_code_desc - CC199 + , "C220" //String p_stat_cd + ); modelAndView.addObject("result", "success"); @@ -358,7 +361,10 @@ public class CorReqController { if (StringUtil.isNotEmpty(corArrReqVO.getRpplChgSeq_0())) { corReqVO.setRpplChgSeq(corArrReqVO.getRpplChgSeq_0()); - corReqService.corReqDelAjax(corReqVO); + corReqService.corReqDelAjax(corReqVO + , "사용자>>나의사건관리>조정진행 상황>조정진행 상세>경정신청-삭제" //String p_code_desc - CC199 + , "C230" //String p_stat_cd + ); } @@ -405,7 +411,11 @@ public class CorReqController { corReqVO.setRpplEmail(corArrReqVO.getRpplEmail_0()); }*/ - corReqService.corReqAppAjax(corReqVO); + corReqService.corReqAppAjax(corReqVO + , "사용자>>나의사건관리>조정진행 상황>조정진행 상세>경정신청등록-제출" //String p_code_desc - CC199 + , "C240" //String p_stat_cd + ); + modelAndView.addObject("status", "success"); 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 01326778..221e0026 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/apm/service/ApmService.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/apm/service/ApmService.java @@ -90,7 +90,10 @@ public interface ApmService { int selectApmAdrNoChkCnt(ApmVO apmVO) throws Exception; - void updateApprYn(CorReqVO corReqVO) throws Exception; + void updateApprYn(CorReqVO corReqVO + , String p_code_desc + , String p_stat_cd + ) throws Exception; String selectSbmtIngStatus(String param) 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 27010f32..b2715929 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 @@ -304,8 +304,23 @@ public class ApmServiceImpl implements ApmService { } @Override - public void updateApprYn(CorReqVO corReqVO) throws Exception{ + public void updateApprYn(CorReqVO corReqVO + , String p_code_desc + , String p_stat_cd + ) throws Exception{ apmDAO.updateApprYn(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()); + //adr_hstry_mgr에 값 넣기 - 끝 } 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 bbe48a6e..9b99d862 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java @@ -1493,9 +1493,10 @@ public class ApmController { ansVO.setFrstRegisterId(userId); ansVO.setLastUpdusrId(userId); + //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 ansService.ansSubmitAjax(ansVO - , "사용자>>나의사건관리>조정진행 상황>답변서제출" //String p_code_desc - CC199 - , "C160" //String p_stat_cd + , "조정진행관리>>조정진행목록>조정진행상세>사건문서>P>문서등록" //String p_code_desc - CC199 + , "A160" //String p_stat_cd ); result = "success"; @@ -1661,7 +1662,11 @@ public class ApmController { corretVO.setApprYn(KccadrConstants.ADR_CNCL_RULER_RETN); } - apmService.updateApprYn(corretVO); + //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 + apmService.updateApprYn(corretVO + , "조정진행관리>>조정진행목록>조정진행상세>사건문서>경정신청>P>경정상세-처리" //String p_code_desc - CC199 + , "A250" //String p_stat_cd - 경정처리 + ); modelAndView.addObject("result", "success"); } catch (Exception e) { 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 7c1f2bb4..b7fdeff8 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/dlvinfo/service/DlvinfoService.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/dlvinfo/service/DlvinfoService.java @@ -12,7 +12,10 @@ public interface DlvinfoService { int udateAdjustDeliveryInfo(DlvinfoDetailVO dlvinfoDetailVO) throws Exception; - public void insertAdjustDeliveryInfo(DlvinfoDetailVO dlvinfoDetailVO) throws Exception; + public void insertAdjustDeliveryInfo(DlvinfoDetailVO dlvinfoDetailVO + , String p_code_desc + , String p_stat_cd + ) 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 36c720bb..7ee534e8 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 @@ -12,6 +12,7 @@ import kcc.kccadr.adjPgrMgr.dlvinfo.service.AdrInfoVO; import kcc.kccadr.adjPgrMgr.dlvinfo.service.DlvinfoDetailVO; import kcc.kccadr.adjPgrMgr.dlvinfo.service.DlvinfoService; import kcc.kccadr.adjPgrMgr.dlvinfo.service.DlvinfoVO; +import kcc.kccadr.advc.service.impl.AdrHstryMgrDAO; import kcc.kccadr.cmm.KccadrConstants; import kcc.let.utl.fcc.service.EgovCryptoUtil; @@ -31,6 +32,9 @@ public class DlvinfoServiceImpl implements DlvinfoService { @Resource(name = "egovCryptoUtil") EgovCryptoUtil egovCryptoUtil; + // 조정사건이력관리 DAO + @Resource(name = "adrHstryMgrDAO") + private AdrHstryMgrDAO adrHstryMgrDAO; @Override public List selectAdjustDeliveryInfoList(DlvinfoVO dlvinfoVO) throws Exception { @@ -61,7 +65,10 @@ public class DlvinfoServiceImpl implements DlvinfoService { @Override - public void insertAdjustDeliveryInfo(DlvinfoDetailVO dlvinfoDetailVO) throws Exception { + public void insertAdjustDeliveryInfo(DlvinfoDetailVO dlvinfoDetailVO + , String p_code_desc + , String p_stat_cd + ) throws Exception { String dlvrySeq = idgenService.getNextStringId(); // 고유ID dlvinfoDetailVO.setDlvrySeq(dlvrySeq); @@ -70,6 +77,18 @@ public class DlvinfoServiceImpl implements DlvinfoService { dlvinfoDetailVO.setRecDeDay(StringUtil.getOnlyNum(dlvinfoDetailVO.getRecDeDay())); dlvinfoDetailVO.setRecDeTime(StringUtil.getOnlyNum(dlvinfoDetailVO.getRecDeTime())); dlvinfoDAO.insertAdjustDeliveryInfo(dlvinfoDetailVO); + + //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 + //adr_hstry_mgr에 값 넣기 - 시작 + adrHstryMgrDAO.insert4Func(dlvinfoDetailVO.getAdrSeq() + //, "상태코드수정" + , p_code_desc + //, adjReqMgrVO.getStatCd() + , p_stat_cd + + , dlvinfoDetailVO.getFrstRegisterId() + , dlvinfoDetailVO.getLastUpdusrId()); + //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 ea13d855..209ad0b4 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/dlvinfo/web/DlvinfoController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/dlvinfo/web/DlvinfoController.java @@ -400,8 +400,11 @@ public class DlvinfoController { } - - dlvinfoService.insertAdjustDeliveryInfo(dlvinfoDetailVO); + //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 + dlvinfoService.insertAdjustDeliveryInfo(dlvinfoDetailVO + , "조정진행관리>>조정진행목록>조정진행상세>사건문서>송달정보등록" //String p_code_desc - CC199 + , "A260" //String p_stat_cd - 경정처리 + ); modelAndView.addObject("result", "success"); diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmCorrectionList.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmCorrectionList.jsp index 4fb2e989..9f100440 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmCorrectionList.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmCorrectionList.jsp @@ -25,10 +25,12 @@ list.method = "post"; list.target = "apmCorrectPop"; list.submit(); + list.target = "_self"; } function fncGoList(){ var list = document.list; list.action = ""; + list.tabSeq.value = 0; list.submit(); } diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp index e5fbe123..8d97bfd2 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp @@ -809,6 +809,7 @@ $(document).ready(function(){ +