diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/dtb/service/impl/DtbServiceImpl.java b/src/main/java/kcc/kccadr/adjPgrMgr/dtb/service/impl/DtbServiceImpl.java index 41424321..b0122128 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/dtb/service/impl/DtbServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/dtb/service/impl/DtbServiceImpl.java @@ -114,10 +114,10 @@ public class DtbServiceImpl implements DtbService { , 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='"+dtbVO.getAdrSeq() - + " AND adr_sn='"+dtbVO.getAdrSn() - + " AND ass_seq='"+dtbVO.getAssSeq() - +"' " //, String p_updateQuery + , " WHERE 1=1 AND adr_seq='"+dtbVO.getAdrSeq()+"'" + + " AND adr_sn='"+dtbVO.getAdrSn()+"'" + + " AND ass_seq='"+dtbVO.getAssSeq()+"'" + ); //adr_hstry_mgr에 값 넣기 - 끝 @@ -152,10 +152,10 @@ public class DtbServiceImpl implements DtbService { , 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='"+dtbVO.getAdrSeq() - + " AND adr_sn='"+dtbVO.getAdrSn() - + " AND ass_seq='"+dtbVO.getAssSeq() - +"' " //, String p_updateQuery + , " WHERE 1=1 AND adr_seq='"+dtbVO.getAdrSeq()+"'" + + " AND adr_sn='"+dtbVO.getAdrSn()+"'" + + " AND ass_seq='"+dtbVO.getAssSeq()+"'" + ); //adr_hstry_mgr에 값 넣기 - 끝 @@ -187,10 +187,10 @@ public class DtbServiceImpl implements DtbService { , 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='"+dtbVO.getAdrSeq() - + " AND adr_sn='"+dtbVO.getAdrSn() - + " AND ass_seq='"+dtbVO.getAssSeq() - +"' " //, String p_updateQuery + , " WHERE 1=1 AND adr_seq='"+dtbVO.getAdrSeq()+"'" + + " AND adr_sn='"+dtbVO.getAdrSn()+"'" + + " AND ass_seq='"+dtbVO.getAssSeq()+"'" + ); //adr_hstry_mgr에 값 넣기 - 끝 @@ -221,10 +221,9 @@ public class DtbServiceImpl implements DtbService { , 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='"+dtbVO.getAdrSeq() - + " AND adr_sn='"+dtbVO.getAdrSn() - + " AND ass_seq='"+dtbVO.getAssSeq() - +"' " //, String p_updateQuery + , " WHERE 1=1 AND adr_seq='"+dtbVO.getAdrSeq()+"'" + + " AND adr_sn='"+dtbVO.getAdrSn()+"'" + + " AND ass_seq='"+dtbVO.getAssSeq()+"'" ); //adr_hstry_mgr에 값 넣기 - 끝 @@ -233,7 +232,7 @@ public class DtbServiceImpl implements DtbService { } - int rs = dtbDAO.updateDistribution_setp1(dtbVO); + int rs = dtbDAO.updateDistribution_setp1(dtbVO); //adr_mgr_detail 에서 조정부/조정조사관 업데이트를 함 //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 //adr_hstry_mgr에 값 넣기 - 시작 @@ -248,9 +247,13 @@ public class DtbServiceImpl implements DtbService { , p_adrHstryMgrSeq //, String p_adrHstryMgrSeq , "U" //, String p_useCd I/U/UI/II/RE - , "ADR_ASS_MGR" //, String p_tableName - , "" //, String p_updateQuery - + , "ADR_MGR_DETAIL" //, String p_tableName + , " SET ADR_ADM_ID = null" + + " , MEM_DEPT_SEQ = null" + + " , LAST_UPDT_PNTTM = SYS_DATETIME" + + " , LAST_UPDUSR_ID = '"+dtbVO.getLastUpdusrId()+"'" + + " WHERE ADR_SEQ = '"+dtbVO.getAdrSeq()+"'" + + " AND ADR_SN = '"+dtbVO.getAdrSn()+"'" ); //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 34a7c38a..11b6c6ac 100644 --- a/src/main/java/kcc/kccadr/advc/service/AdrHstryMgrService.java +++ b/src/main/java/kcc/kccadr/advc/service/AdrHstryMgrService.java @@ -37,7 +37,7 @@ public interface AdrHstryMgrService { List selectPagingList(AdrHstryMgrVO adrHstryMgrVO) throws Exception; //L - List selectCancelList(AdrHstryMgrVO adrHstryMgrVO) throws Exception; + List selectCancelListEqual(AdrHstryMgrVO adrHstryMgrVO) throws Exception; //D int delete4CancelAll(AdrHstryMgrVO adrHstryMgrVO) throws Exception; 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 110df16f..70ffb1ea 100644 --- a/src/main/java/kcc/kccadr/advc/service/impl/AdrHstryMgrDAO.java +++ b/src/main/java/kcc/kccadr/advc/service/impl/AdrHstryMgrDAO.java @@ -197,9 +197,14 @@ public class AdrHstryMgrDAO extends EgovAbstractDAO { } */ - //L - public List selectCancelList(AdrHstryMgrVO adrHstryMgrVO) throws Exception { - List tlist = (List) list("AdrHstryMgrDAO.selectCancelList", adrHstryMgrVO); + //L + public List selectCancelListEqual(AdrHstryMgrVO adrHstryMgrVO) throws Exception { + List tlist = (List) list("AdrHstryMgrDAO.selectCancelListEqual", adrHstryMgrVO); + return tlist; + } + + public List selectCancelListGt(AdrHstryMgrVO adrHstryMgrVO) throws Exception { + List tlist = (List) list("AdrHstryMgrDAO.selectCancelListGt", adrHstryMgrVO); return tlist; } 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 1861e0aa..feef02d0 100644 --- a/src/main/java/kcc/kccadr/advc/service/impl/AdrHstryMgrServiceImpl.java +++ b/src/main/java/kcc/kccadr/advc/service/impl/AdrHstryMgrServiceImpl.java @@ -104,8 +104,8 @@ public class AdrHstryMgrServiceImpl implements AdrHstryMgrService { */ //List - public List selectCancelList(AdrHstryMgrVO adrHstryMgrVO) throws Exception{ - return adrHstryMgrDAO.selectCancelList(adrHstryMgrVO); + public List selectCancelListEqual(AdrHstryMgrVO adrHstryMgrVO) throws Exception{ + return adrHstryMgrDAO.selectCancelListEqual(adrHstryMgrVO); } //D @@ -129,9 +129,24 @@ public class AdrHstryMgrServiceImpl implements AdrHstryMgrService { //step4.각각의 상세 전체 대상 삭제 - Q //step5.전체 대상 삭제 - Q - + + //step0.해당 취소의 상태 코드 값을 가져온다. + AdrHstryMgrVO adrHstryMgrVOTmp1 = adrHstryMgrDAO.selectDetail(adrHstryMgrVO); + //step1.전체 리스트를 가져온다. - List tlist = adrHstryMgrDAO.selectCancelList(adrHstryMgrVO); + //List tlist = adrHstryMgrDAO.selectCancelListEqual(adrHstryMgrVO); + List tlist = null; + + // + if (adrHstryMgrVOTmp1.getMenuId().equals("201050") //접수결재완료 취소 + || adrHstryMgrVOTmp1.getMenuId().equals("202050") //조정부지정완료 취소 + ) { //결재완료인 경우는 앞단과 연관된 액션이 많아서, 결재완료 이후 값만 삭제처리하도록 대상을 가져온다. + tlist = adrHstryMgrDAO.selectCancelListGt(adrHstryMgrVO); + + }else { + tlist = adrHstryMgrDAO.selectCancelListEqual(adrHstryMgrVO); + + } for (int i=0;i - SELECT FROM @@ -202,7 +202,23 @@ ORDER BY a.adr_hstry_mgr_seq DESC - + + + + DELETE