From 3e84a85023c7c04be76f1e8d000a0b060f8ae19d Mon Sep 17 00:00:00 2001 From: hylee Date: Thu, 27 Oct 2022 10:13:50 +0900 Subject: [PATCH] =?UTF-8?q?feat=20:=20=EA=B3=BC=EA=B1=B0=EC=82=AC=EA=B1=B4?= =?UTF-8?q?=EC=83=81=EC=84=B8=20-=20=EC=A1=B0=EC=A0=95=EC=82=AC=EA=B1=B4?= =?UTF-8?q?=20=EC=9D=BC=EB=B0=98:=EC=8B=A0=EC=B2=AD=EC=B7=A8=EC=A7=80,?= =?UTF-8?q?=EC=9B=90=EC=9D=B8=20=EC=B6=94=EA=B0=80=20-=20=EC=8B=A0?= =?UTF-8?q?=EC=B2=AD=EC=A0=95=EB=B3=B4=20=EC=9D=B4=EB=A0=A5=20=EC=A0=95?= =?UTF-8?q?=EB=B3=B4=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/AdjReqMgrPastService.java | 2 + .../service/impl/AdjReqMgrPastDAO.java | 4 ++ .../impl/AdjReqMgrPastServiceImpl.java | 17 ++++- .../web/AdjReqMgrPastController.java | 8 ++- .../adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml | 20 ++++++ .../adjReqMgrPast/adjReqMgrPastDetail.jsp | 4 +- .../kccadr/adjReqMgrPast/tab/adjCloseTab0.jsp | 66 ++++++++++++++++--- .../kccadr/adjReqMgrPast/tab/adjCloseTab2.jsp | 58 ++++++---------- 8 files changed, 123 insertions(+), 56 deletions(-) diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java b/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java index c70f1cfd..72f47cef 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java @@ -48,5 +48,7 @@ public interface AdjReqMgrPastService { int selectAdjReqMgrPastListCount(AdjReqMgrPastVO adjReqMgrPastVO); Map selectAdjPastCloseTab0(AdjReqMgrPastVO adjReqMgrPastVO); + + Map selectAdjPastCloseTab2(AdjReqMgrPastVO adjReqMgrPastVO); } 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 25112d1e..ed793dd9 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastDAO.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastDAO.java @@ -187,5 +187,9 @@ public class AdjReqMgrPastDAO extends EgovAbstractDAO { insert("adjReqMgrPastDAO.insertAdjAss", adjAssMgrPastVO ); } + public List selectHstryInfo(AdjReqMgrPastVO adjReqMgrPastVO) { + return (List) list("adjReqMgrPastDAO.selectHstryInfo", 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 6459781f..f8140501 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java @@ -1003,17 +1003,28 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements Map map = new HashMap(); + // 신청정보 AdjReqMgrPastVO adjReqMgrPastMainVO = adjReqMgrPastDAO.selectMainInfo(adjReqMgrPastVO); + + // 기일조서 정보 List adrPrtclMgrInfoVO = adjReqMgrPastDAO.selectAdrPrtclMgrInfo(adjReqMgrPastVO); - adrPrtclMgrInfoVO.forEach(t-> System.out.println("t.getReObRpplNm() :: "+ t.getReObRpplNm())); - decryptInfomation(adjReqMgrPastMainVO); map.put("adjReqMgrPastMainVO", adjReqMgrPastMainVO); map.put("adrPrtclMgrInfoVO", adrPrtclMgrInfoVO); + + return map; + } + + + @Override + public Map selectAdjPastCloseTab2(AdjReqMgrPastVO adjReqMgrPastVO) { + Map map = new HashMap(); - + // 과거사건 - 신청정보 +// List adjReqMgrPastHstryVO = adjReqMgrPastDAO.selectHstryInfo(adjReqMgrPastVO); + map.put("adjReqMgrPastHstryVO", adjReqMgrPastDAO.selectHstryInfo(adjReqMgrPastVO)); return map; } diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java b/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java index 1fd8a016..47990dd7 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java @@ -168,8 +168,7 @@ public class AdjReqMgrPastController { @RequestMapping("/kccadr/adjReqMgOff/adjCloseTab0.do") public String adjCloseTab0(@ModelAttribute("adjReqMgrPastVO") AdjReqMgrPastVO adjReqMgrPastVO, ModelMap model) throws Exception { - - /* 목록을 가져 온다 */ + /* 조정사건 내용을 가져 온다 */ Map tab0ResultMap = adjReqMgrPastService.selectAdjPastCloseTab0(adjReqMgrPastVO); // model.addAttribute("manualMap", manualMap); @@ -186,6 +185,11 @@ public class AdjReqMgrPastController { @RequestMapping("/kccadr/adjReqMgOff/adjCloseTab2.do") public String adjCloseTab2(@ModelAttribute("adjReqMgrPastVO") AdjReqMgrPastVO adjReqMgrPastVO, ModelMap model) throws Exception { + + /* 조정사건 내용을 가져 온다 */ + Map tab2ResultMap = adjReqMgrPastService.selectAdjPastCloseTab2(adjReqMgrPastVO); + model.addAttribute("hstryVOList", tab2ResultMap.get("adjReqMgrPastHstryVO")); + return "kccadr/adjReqMgrPast/tab/adjCloseTab2"; } 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 d4888193..7a8f77e7 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 @@ -693,6 +693,8 @@ , ma.ADR_NO as adrNo , ma.CC_TY as ccTy , de.pst_cn as pstCn + , ma.req_cn1 as reqCn1 + , ma.req_cn2 as reqCn2 , TO_CHAR(ma.FRST_REGIST_PNTTM, 'YYYY-MM-DD') AS frstRegistPnttm , TO_CHAR(ma.LAST_UPDT_PNTTM, 'YYYY-MM-DD') AS lastUpdtPnttm , ( @@ -1149,6 +1151,24 @@ WHERE ADR_SEQ = #adrSeq# + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastDetail.jsp index d5f96f2f..d7029220 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastDetail.jsp @@ -39,9 +39,9 @@ case 0: return '/kccadr/adjReqMgOff/adjCloseTab0.do'; case 1: - return '/kccadr/adjclsmgr/adjCloseTab1.do'; + return '/kccadr/adjReqMgOff/adjCloseTab1.do'; case 2: - return '/kccadr/adjclsmgr/adjCloseTab2.do'; + return '/kccadr/adjReqMgOff/adjCloseTab2.do'; } } diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/tab/adjCloseTab0.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/tab/adjCloseTab0.jsp index bf87c0dd..d036158c 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/tab/adjCloseTab0.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/tab/adjCloseTab0.jsp @@ -131,10 +131,6 @@ function goToEntDetailNotice(){ - - -<%--

--%> - 종결상태

@@ -147,12 +143,6 @@ function goToEntDetailNotice(){

- - - -<%-- --%> - - 조정 조사관 @@ -171,6 +161,62 @@ function goToEntDetailNotice(){ + + + + + + +
+

신청 정보

+
+
+ + + + + + + + + + + + + + + + + + + +
저작물 종류 + +
신청취지 + +
신청원인 + +
+
+ + + + + + + + + + + + + + + + + + + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/tab/adjCloseTab2.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/tab/adjCloseTab2.jsp index c78f64e0..eb805efb 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/tab/adjCloseTab2.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/tab/adjCloseTab2.jsp @@ -12,18 +12,17 @@ -조정종결상세 +조정종결상세 - 신청정보 - " />

신청 정보

@@ -31,52 +30,33 @@ function fn_egov_downFile(atchFileId, fileSn){ - + -<%-- --%> - + - - - - - - - - - + + + + + + - +
일자 일자 내용 비고
-

${list.hstryDe}

- 		- - - - - ${list.statCd} - - - ${list.hstryDetailCn} ${list.statCd} 제출 - - - -

- - ${list.hstryCn} - - -

+

${list.hstryDe}

+ 		+

${list.hstryCn}

+ 		+

${list.hstryDetailCn}

+