diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java b/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java index 068ea267..0c2ad641 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java @@ -14,5 +14,7 @@ public interface AdjReqMgrPastService { //오프라인 조정신청 정보 입력 ResponseEntity insertAdjReqMgrRpplReq(AdjReqMgrPastVO adjReqMgrPastVO) throws Exception; + + List selectAdrPrtclMgrPastList(AdjReqMgrPastVO adjReqMgrPastVO); } diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastVO.java b/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastVO.java index 8cdcec39..99ecf4b3 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastVO.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastVO.java @@ -9,6 +9,11 @@ import kcc.kccadr.adjreqmgr.service.AdjReqMgrVO; public class AdjReqMgrPastVO extends ComDefaultVO implements Serializable { + /** + * + */ + private static final long serialVersionUID = -4127391913185204357L; + private AdjReqMgrVO adrVO; private List adjReqMgrVoList = new ArrayList(); @@ -51,6 +56,7 @@ public class AdjReqMgrPastVO extends ComDefaultVO implements Serializable { private String openYn = ""; // 조정공개여부 private String nextAppDe = ""; // 다음기일일시 private String prtclCn = ""; // 기일조서내용 + private String appDe = ""; // 조정기일일시 // 조정사건관리인 // private String adrSeq = ""; // 조정일련번호 @@ -142,9 +148,13 @@ public class AdjReqMgrPastVO extends ComDefaultVO implements Serializable { private String rpplConnNo; - private String resPonDentNms = ""; //피신청인 총 갯수 + private String resPonDentNms; //피신청인 총 갯수 - + private String appPlaceTy; //기일장소구분 + private String appPlace; //조정기일장소명 + + private String nextAppDeYn; //다음기일차후지정여부 + private String appResultTy; //기일결과 구분 @@ -774,6 +784,36 @@ public class AdjReqMgrPastVO extends ComDefaultVO implements Serializable { public void setResPonDentNms(String resPonDentNms) { this.resPonDentNms = resPonDentNms; } + public String getAppDe() { + return appDe; + } + public void setAppDe(String appDe) { + this.appDe = appDe; + } + public String getAppPlaceTy() { + return appPlaceTy; + } + public void setAppPlaceTy(String appPlaceTy) { + this.appPlaceTy = appPlaceTy; + } + public String getAppPlace() { + return appPlace; + } + public void setAppPlace(String appPlace) { + this.appPlace = appPlace; + } + public String getNextAppDeYn() { + return nextAppDeYn; + } + public void setNextAppDeYn(String nextAppDeYn) { + this.nextAppDeYn = nextAppDeYn; + } + public String getAppResultTy() { + return appResultTy; + } + public void setAppResultTy(String appResultTy) { + this.appResultTy = appResultTy; + } diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastDAO.java b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastDAO.java index a9f88ef8..3318c033 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastDAO.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastDAO.java @@ -37,6 +37,10 @@ public class AdjReqMgrPastDAO extends EgovAbstractDAO { public void insertAdrSnInit(AdjReqMgrPastVO adjReqMgrPastVO) { insert("adjReqMgrPastDAO.insertAdrSnInit",adjReqMgrPastVO ); } + + public List selectAdrPrtclMgrPastList(AdjReqMgrPastVO adjReqMgrPastVO) { + return (List) list("adjReqMgrPastDAO.selectAdrPrtclMgrPastList", adjReqMgrPastVO); + } } diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java index 665639c5..84c6caf5 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java @@ -435,5 +435,15 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements return resultCnt; } + + @Override + public List selectAdrPrtclMgrPastList(AdjReqMgrPastVO adjReqMgrPastVO) { + adjReqMgrPastVO.setAdrSeq("ADR_0000000000002920"); + System.out.println("adjReqMgrPastVO.getAdrSeq() : "+ adjReqMgrPastVO.getAdrSeq()); + // TODO Auto-generated method stub +// return null; + return adjReqMgrPastDAO.selectAdrPrtclMgrPastList(adjReqMgrPastVO); + } + } diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java b/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java index dd8aef06..d07cbac5 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java @@ -139,7 +139,19 @@ public class AdjReqMgrPastController { * @throws Exception */ @RequestMapping("/kccadr/adjReqMgOff/adjReqMgrPastProgRegist.do") - public String adjReqMgrPastProgRegist(@ModelAttribute("searchVO") AdjReqMgrPastVO adjReqMgrPastVO, ModelMap model) throws Exception { + public String adjReqMgrPastProgRegist(@ModelAttribute("adjReqMgrPastVO") AdjReqMgrPastVO adjReqMgrPastVO, ModelMap model) throws Exception { + + + //TODO 테스트로 인한 seq 코딩 + + + List adjReqMgrPastListVO = adjReqMgrPastService.selectAdrPrtclMgrPastList(adjReqMgrPastVO); + + System.out.println("adjReqMgrPastListVO size : "+adjReqMgrPastListVO.size()); + for(AdjReqMgrPastVO aa : adjReqMgrPastListVO) + { + System.out.println(aa.getAdrSn()); + } //로그인 권한정보 불러오기 // LoginVO user = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null; @@ -164,7 +176,7 @@ public class AdjReqMgrPastController { // } // // -// model.addAttribute("reqPerTotCnt", reqPerTotCnt); + model.addAttribute("adjReqMgrPastListVO", adjReqMgrPastListVO); return "kccadr/adjReqMgrPast/adjReqMgrPastProgRegist"; } diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgr/AdjReqMgr_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgr/AdjReqMgr_SQL_Mysql.xml index 77123b3d..994e022b 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgr/AdjReqMgr_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgr/AdjReqMgr_SQL_Mysql.xml @@ -4,8 +4,7 @@ - - + INSERT INTO ADR_MGR_MASTER ( @@ -891,5 +890,6 @@ ) + diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml index 36ba07cb..1888c6b2 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml @@ -1,11 +1,12 @@ - + + + SELECT + adr_seq as adrSeq + , adr_sn as adrSn + , prtcl_seq as prtclSeq + , open_yn as openYn + , app_de as appDe + , app_place_ty as appPlaceTy + , app_place as appPlace + , next_app_de_yn as nextAppDeYn + , next_app_de as nextAppDe + , prtcl_cn as prtclCn + , sbmt_yn as sbmtYn + , sbmt_de as sbmtDe + , appr_yn as apprYn + , appr_de as apprDe + , frst_regist_pnttm as frstRegistPnttm + , frst_register_id as frstRegisterId + , last_updt_pnttm as lastUpdtPnttm + , last_updusr_id as lastUpdusrId + , app_result_ty as appResultTy + FROM adr_prtcl_mgr + where adr_seq = #adrSeq# + + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastBasicRegist.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastBasicRegist.jsp index c391b3ad..682f2c4c 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastBasicRegist.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastBasicRegist.jsp @@ -37,17 +37,15 @@ -<%--
--%> - -<%--
--%> -
- - -
+
+ + +
@@ -1392,9 +1390,8 @@ -
+ -
diff --git a/src/main/webapp/js/kccadr/adjReqMgrPast/event.js b/src/main/webapp/js/kccadr/adjReqMgrPast/event.js index 870ef11d..3e295ef8 100644 --- a/src/main/webapp/js/kccadr/adjReqMgrPast/event.js +++ b/src/main/webapp/js/kccadr/adjReqMgrPast/event.js @@ -1,16 +1,17 @@ // 예문 팝업 function -function openExampleAdminPop(expmCd) { + +function openExampleAdminPop(exmpCd) { + console.log('exmpCd : ', exmpCd); var pop = document.pop; pop.ccTy.value = $('#ccTy').val(); - pop.expmCd.value = expmCd; + pop.exmpCd.value = exmpCd; - commonPopWindowopenForm("/kccadr/adjPgrMgr/apm/popup/adjstReqOpenExamplePop.do", '600', '400', "openExampleAdminPop", $('#pop')); + commonPopWindowopenForm("/kccadr/adjPgrMgr/apm/popup/adjstReqOpenExamplePop.do", '500', '400', "openExampleAdminPop", $('#pop')); } - /* 최종결과 선택에 따른 액션 00 -> 종결 diff --git a/src/main/webapp/js/kccadr/adjReqMgrPast/value.js b/src/main/webapp/js/kccadr/adjReqMgrPast/value.js index 7fc08f52..400fb19a 100644 --- a/src/main/webapp/js/kccadr/adjReqMgrPast/value.js +++ b/src/main/webapp/js/kccadr/adjReqMgrPast/value.js @@ -1081,7 +1081,8 @@ console.log('data : ', data); if(data.status == 'OK'){ alert(data.data); - dataSub + $('#adrSeq').val(dataSub); + $('#nextGoPageForm').submit(); } else if(data.status == 'Unauthorized') {