From b084f6c560cb3a77bd470af67283eae3ec9844c9 Mon Sep 17 00:00:00 2001 From: jjh Date: Fri, 28 Jun 2024 17:37:10 +0900 Subject: [PATCH] =?UTF-8?q?1.=20=EC=86=8C=EC=8A=A4=20=EC=88=98=EC=A0=95=20?= =?UTF-8?q?2.=20=EC=A3=BC=EC=84=9D=20=EC=88=98=EC=A0=95.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xit/fims/payer/web/PayerController.java | 16 +- .../WEB-INF/jsp/fims/epst/epst02010-main.jsp | 346 +++++----- .../WEB-INF/jsp/fims/epst/epst02020-info.jsp | 14 +- .../WEB-INF/jsp/fims/epst/epst02030-main.jsp | 521 +++++++------- .../WEB-INF/jsp/fims/epst/epst02040-info.jsp | 13 +- .../WEB-INF/jsp/fims/epst/epst02050-main.jsp | 419 ++++++------ .../WEB-INF/jsp/fims/excl/excl01010-main.jsp | 548 ++++++++------- .../WEB-INF/jsp/fims/excl/excl01020-info.jsp | 7 +- .../WEB-INF/jsp/fims/excl/excl02010-main.jsp | 642 +++++++++--------- .../WEB-INF/jsp/fims/excl/excl02020-info.jsp | 17 +- .../WEB-INF/jsp/fims/excl/excl02030-info.jsp | 14 +- .../WEB-INF/jsp/fims/excl/excl02040-info.jsp | 14 +- .../WEB-INF/jsp/fims/excl/excl03010-main.jsp | 474 +++++++------ .../WEB-INF/jsp/fims/levy/levy01010-main.jsp | 549 ++++++++------- .../WEB-INF/jsp/fims/levy/levy01020-info.jsp | 34 +- .../WEB-INF/jsp/fims/levy/levy01050-main.jsp | 634 +++++++++-------- .../WEB-INF/jsp/fims/levy/levy02010-main.jsp | 493 +++++++------- .../WEB-INF/jsp/fims/levy/levy02020-info.jsp | 34 +- .../jsp/fims/payer/payer01020-info.jsp | 50 +- .../WEB-INF/jsp/fims/rcvm/rcvm01010-main.jsp | 641 +++++++++-------- .../WEB-INF/jsp/fims/rcvm/rcvm01020-info.jsp | 37 +- .../WEB-INF/jsp/fims/sprt/sprt02020-info.jsp | 4 +- .../WEB-INF/jsp/fims/sprt/sprt04010-main.jsp | 375 +++++----- .../WEB-INF/jsp/fims/sprt/sprt04020-info.jsp | 31 +- 24 files changed, 2946 insertions(+), 2981 deletions(-) diff --git a/src/main/java/cokr/xit/fims/payer/web/PayerController.java b/src/main/java/cokr/xit/fims/payer/web/PayerController.java index 74da182d..1a26a349 100644 --- a/src/main/java/cokr/xit/fims/payer/web/PayerController.java +++ b/src/main/java/cokr/xit/fims/payer/web/PayerController.java @@ -4,6 +4,7 @@ import java.util.List; import java.util.Map; import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.PostMapping; @@ -130,22 +131,23 @@ public class PayerController extends ApplicationController { */ @Task @RequestMapping(name="납부자 정보 조회", value=METHOD_URL.getPayerInfo) - public ModelAndView getPayerInfo(PayerQuery req) { + public ModelAndView getPayerInfo(HttpServletRequest hReq, PayerQuery req) { DataObject payerInfo = payerService.getPayerInfo(req); boolean json = jsonResponse(); - ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/payer/payer01020-info"); // View(jsp)에서 사용할 공통코드를 조회 Map> commonCodes = getCodesOf("FIM011", "FIM014", "FIM054"); return mav - .addObject("pageName", "payer01020") - .addObject("FIM011List", commonCodes.get("FIM011")) // 납부자 구분 코드(RTPYR_SE_CD) - .addObject("FIM014List", commonCodes.get("FIM014")) // 납부자 상태 코드(RTPYR_STTS_CD) - .addObject("FIM054List", commonCodes.get("FIM054")) // 업무 구분 코드(TASK_SE_CD) - .addObject("payerInfo", json ? payerInfo : toJson(payerInfo)) // 납부자 정보 + .addObject("openerPageName", hReq.getParameter("openerPageName")) // 호출한 Jsp PageName + .addObject("pageName", "payer01020") // jsp pageName + .addObject("infoPrefix", "payer") // prefix + .addObject("FIM011List", commonCodes.get("FIM011")) // 납부자 구분 코드(RTPYR_SE_CD) + .addObject("FIM014List", commonCodes.get("FIM014")) // 납부자 상태 코드(RTPYR_STTS_CD) + .addObject("FIM054List", commonCodes.get("FIM054")) // 업무 구분 코드(TASK_SE_CD) + .addObject("payerInfo", json ? payerInfo : toJson(payerInfo)) // 납부자 정보 ; } diff --git a/src/main/webapp/WEB-INF/jsp/fims/epst/epst02010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/epst/epst02010-main.jsp index 96d8ae04..5383e55e 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/epst/epst02010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/epst/epst02010-main.jsp @@ -7,186 +7,184 @@
- - -
-
- -
- + + - - - - -
- - -
- - - - -
diff --git a/src/main/webapp/WEB-INF/jsp/fims/epst/epst02020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/epst/epst02020-info.jsp index 5028ac30..73cc8fa5 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/epst/epst02020-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/epst/epst02020-info.jsp @@ -7,8 +7,6 @@
- -
@@ -44,23 +42,23 @@
- +
+ - -
+
+
- -
-
+
+