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 690ca1a3..02942c63 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/apm/service/ApmService.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/apm/service/ApmService.java @@ -85,6 +85,10 @@ public interface ApmService { //조정기일 날짜 및 장소, 주소 정보 불러오기 - 해당 사건에 등록된 모든 차수의 기일정보를 불러옴(조정위원(부서장)이 승인완료 된것만 불러옴) List selectApmChgDateConfirmInfo(PgrCmmVO cmmVO) throws Exception; + + //조정기일 날짜 및 장소, 주소 정보 불러오기 - 해당 사건에 등록된 모든 차수의 기일정보를 불러옴(조정위원(부서장)이 승인완료 된것만 불러옴) + //각 차수별로 승인된 최종 값의 정보를 가져온다. + List selectApmChgDateConfirmInfoList202211(PgrCmmVO cmmVO) throws Exception; // 사용자 차수별 기일변경 신청건수 조회 List selectApmChgDateInfoCnt(PgrCmmVO cmmVO) throws Exception; diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/apm/service/impl/ApmDAO.java b/src/main/java/kcc/kccadr/adjPgrMgr/apm/service/impl/ApmDAO.java index 5e8fa653..e72e831f 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/apm/service/impl/ApmDAO.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/apm/service/impl/ApmDAO.java @@ -172,7 +172,13 @@ public class ApmDAO extends EgovAbstractDAO { return (List) list("Apm.selectApmChgDateConfirmInfo", cmmVO); } - + + @SuppressWarnings("unchecked") + public List selectApmChgDateConfirmInfoList202211(PgrCmmVO cmmVO) throws Exception{ + + return (List) list("Apm.selectApmChgDateConfirmInfoList202211", cmmVO); + } + @SuppressWarnings("unchecked") public List selectApmChgDateInfoCnt(PgrCmmVO cmmVO) 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 5c25315b..522cbe09 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 @@ -541,6 +541,11 @@ public class ApmServiceImpl implements ApmService { return apmDAO.selectApmChgDateConfirmInfo(cmmVO); } + public List selectApmChgDateConfirmInfoList202211(PgrCmmVO cmmVO) throws Exception{ + + return apmDAO.selectApmChgDateConfirmInfoList202211(cmmVO); + } + public List selectApmChgDateInfoCnt(PgrCmmVO cmmVO) throws Exception{ return apmDAO.selectApmChgDateInfoCnt(cmmVO); 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 4b98ded8..701ca66e 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java @@ -424,7 +424,9 @@ public class ApmController { model.addAttribute("rpplRepondList", rpplRepondList); // 조정기일 - 등록된 조정기일 중 조정위원 승인이 완료된 정보를 모두 불러옴(기일 승인이 완료된 건만 불러옴) - List apmChgDateList = apmService.selectApmChgDateConfirmInfo(cmmVO); + //List apmChgDateList = apmService.selectApmChgDateConfirmInfo(cmmVO); + List apmChgDateList = apmService.selectApmChgDateConfirmInfoList202211(cmmVO); + model.addAttribute("apmChgDateList", apmChgDateList); // 사용자 조정기일 변경신청 건이 있는지 확인 diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/PgrCmmVO.java b/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/PgrCmmVO.java index 0e070406..336bc948 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/PgrCmmVO.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/PgrCmmVO.java @@ -52,6 +52,7 @@ public class PgrCmmVO extends ComDefaultVO implements Serializable { private String apprYn; // 결재여부 private String appSeq; // 조정기일일련번호 + private String appSeqMin; // 조정기일일련번호 최소값(해당 차수에서 최초로 성공한 값(?)) private String appSbmtYn; // 변경제출여부 private String appChgCn; //기일변경사유 @@ -1164,6 +1165,14 @@ public class PgrCmmVO extends ComDefaultVO implements Serializable { public void setAssSeq2SelectYn(String assSeq2SelectYn) { this.assSeq2SelectYn = assSeq2SelectYn; } + + public String getAppSeqMin() { + return appSeqMin; + } + + public void setAppSeqMin(String appSeqMin) { + this.appSeqMin = appSeqMin; + } 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 6acf96f6..942da22b 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/iam/web/InternalApprovManageController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/iam/web/InternalApprovManageController.java @@ -384,6 +384,9 @@ public class InternalApprovManageController { ) { //사건 종결인 경우는 바로 조정종결 처리를 한다. arv.setStatCd("400000"); // 최종 변경 상태값 + + s_adrHstryMgrSeq = adrHstryMgrSeqGnrService.getNextStringId(); //코드값도 새로운 값으로 한번더 따야한다. + kccadrMgrUdtService.updateAdrMgrUdt(arv , s_adrHstryMgrSeq ); diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/apm/Apm_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/apm/Apm_SQL_Mysql.xml index 6046b849..19c7c3ef 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/apm/Apm_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/apm/Apm_SQL_Mysql.xml @@ -933,6 +933,114 @@ + + " /> + " /> + " /> + + + + + +
" /> " /> @@ -658,7 +707,8 @@ || info.statCd eq '303050' || info.statCd eq '304090' }"> - + + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iam/internalApprovManageDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iam/internalApprovManageDetail.jsp index 40550689..f9d7aa79 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iam/internalApprovManageDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iam/internalApprovManageDetail.jsp @@ -773,6 +773,7 @@ }); } + function getPageUrl(idx) { console.log('idx : ', idx); switch (idx) { diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iam/internalApprovManageEndDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iam/internalApprovManageEndDetail.jsp index 5ccb1667..79d6f0a6 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iam/internalApprovManageEndDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iam/internalApprovManageEndDetail.jsp @@ -36,6 +36,45 @@