From ddf371a178f37ec8deab9df0c385cf11489399c8 Mon Sep 17 00:00:00 2001 From: jjh Date: Fri, 28 Jun 2024 14:34:34 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B0=9C=EB=B3=84=EC=B4=9D=EC=A0=95=EB=B3=B4?= =?UTF-8?q?=20=EC=88=98=EC=A0=95.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xit/fims/sprt/web/Sprt02Controller.java | 23 ++- .../WEB-INF/jsp/fims/sprt/sprt02020-info.jsp | 15 +- .../WEB-INF/jsp/fims/sprt/sprt02030-info.jsp | 22 ++- .../WEB-INF/jsp/fims/sprt/sprt02040-info.jsp | 1 - .../WEB-INF/jsp/fims/sprt/sprt02050-info.jsp | 58 +++---- .../WEB-INF/jsp/fims/sprt/sprt02060-info.jsp | 147 ++++++++-------- .../WEB-INF/jsp/fims/sprt/sprt02070-info.jsp | 90 +++++----- .../WEB-INF/jsp/fims/sprt/sprt02080-info.jsp | 164 +++++++++--------- 8 files changed, 250 insertions(+), 270 deletions(-) diff --git a/src/main/java/cokr/xit/fims/sprt/web/Sprt02Controller.java b/src/main/java/cokr/xit/fims/sprt/web/Sprt02Controller.java index a40ee15e..0b0bca70 100644 --- a/src/main/java/cokr/xit/fims/sprt/web/Sprt02Controller.java +++ b/src/main/java/cokr/xit/fims/sprt/web/Sprt02Controller.java @@ -310,8 +310,8 @@ public class Sprt02Controller extends ApplicationController { // 재조회로 호출되었다면.. if (req.getCallPurpose().equals("refresh")) { - DataObject totalInfo = sprt02Service.getCrdnInfo(req); // 단속(TB_CRDN) 대장 조회 - mav.addObject("totalInfo", json ? totalInfo : toJson(totalInfo)); // 단속 정보 + DataObject totalInfo = sprt02Service.getCrdnInfo(req); // 단속(TB_CRDN) 대장 조회 + mav.addObject("totalInfo", json ? totalInfo : toJson(totalInfo)); // 단속 정보 } return mav; @@ -339,15 +339,14 @@ public class Sprt02Controller extends ApplicationController { levyQuery.setDelYn(req.getDelYn()); levyQuery.setOrderBy("LEVY_ID DESC"); // 정렬 - DataObject levy = levyService.getLevyInfo(levyQuery); + DataObject levyInfo = levyService.getLevyInfo(levyQuery); boolean json = jsonResponse(); - ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/sprt/sprt02060-info"); mav.addObject("pageNameMain", "sprt02010") .addObject("pageName", "sprt02060") - .addObject("levy", json ? levy : toJson(levy)) // 부과 정보 + .addObject("levyInfo", json ? levyInfo : toJson(levyInfo)) // 부과 정보 ; // 재조회로 호출되었다면.. @@ -381,15 +380,14 @@ public class Sprt02Controller extends ApplicationController { rcvmtQuery.setDelYn(req.getDelYn()); rcvmtQuery.setOrderBy("R.RCVMT_ID DESC"); - List rcvmt = rcvmtService.getRcvmts(rcvmtQuery); + List rcvmts = rcvmtService.getRcvmts(rcvmtQuery); boolean json = jsonResponse(); - ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/sprt/sprt02070-info"); mav.addObject("pageNameMain", "sprt02010") .addObject("pageName", "sprt02070") - .addObject("rcvmt", json ? rcvmt : toJson(rcvmt)) // 수납 정보 + .addObject("rcvmts", json ? rcvmts : toJson(rcvmts)) // 수납 정보 ; // 재조회로 호출되었다면.. @@ -425,21 +423,20 @@ public class Sprt02Controller extends ApplicationController { cvlcptDscsnQuery.setCrdnId(req.getCrdnId()); cvlcptDscsnQuery.setVhrno(req.getVhrno()); - List cvlcptDscsn = cvlcptDscsnService.getCvlcptDscsns(cvlcptDscsnQuery); + List cvlcptDscsns = cvlcptDscsnService.getCvlcptDscsns(cvlcptDscsnQuery); boolean json = jsonResponse(); - ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/sprt/sprt02080-info"); mav.addObject("pageNameMain", "sprt02010") .addObject("pageName", "sprt02080") - .addObject("cvlcptDscsn", json ? cvlcptDscsn : toJson(cvlcptDscsn)) // 민원상담내용 정보 + .addObject("cvlcptDscsns", json ? cvlcptDscsns : toJson(cvlcptDscsns)) // 민원상담내용 정보 ; // 재조회로 호출되었다면.. if (req.getCallPurpose().equals("refresh")) { - DataObject totalInfo = sprt02Service.getCrdnInfo(req); // 단속(TB_CRDN) 대장 조회 - mav.addObject("totalInfo", json ? totalInfo : toJson(totalInfo)); // 단속 정보 + DataObject totalInfo = sprt02Service.getCrdnInfo(req); // 단속(TB_CRDN) 대장 조회 + mav.addObject("totalInfo", json ? totalInfo : toJson(totalInfo)); // 단속 정보 } return mav; diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02020-info.jsp index 745aaa73..fde04396 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02020-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02020-info.jsp @@ -211,7 +211,8 @@ - + +
@@ -282,8 +283,10 @@
- - + + + + @@ -291,7 +294,7 @@ - + diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02070-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02070-info.jsp index d27c811c..8810069c 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02070-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02070-info.jsp @@ -2,9 +2,8 @@ <%@ include file="/WEB-INF/jsp/include/taglib.jsp"%> -
+
-
@@ -101,7 +100,7 @@
-
+
@@ -214,14 +213,14 @@ - + - - + + - + diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02080-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02080-info.jsp index 728f5e29..aa11c03f 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02080-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02080-info.jsp @@ -82,10 +82,12 @@ + - + + - +