From a66ff8b20cf8e3f611c2058912835832559577f3 Mon Sep 17 00:00:00 2001 From: JoJH Date: Fri, 1 Nov 2024 14:27:07 +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/payer/web/PayerController.java | 35 ++++++++++--------- .../java/cokr/xit/fims/sprt/SprtQuery.java | 10 +++--- .../xit/fims/sprt/web/Sprt02Controller.java | 21 ++++++----- 3 files changed, 33 insertions(+), 33 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 9aadc17f..c39c3d41 100644 --- a/src/main/java/cokr/xit/fims/payer/web/PayerController.java +++ b/src/main/java/cokr/xit/fims/payer/web/PayerController.java @@ -154,23 +154,24 @@ public class PayerController extends ApplicationController { @Task @RequestMapping(name="납부자 정보 조회", value=METHOD_URL.getPayerInfo) 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("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)) // 납부자 정보 - ; + boolean json = jsonResponse(); + ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/payer/payer01020-info"); + + DataObject info = payerService.getPayerInfo(req); + mav.addObject("Info", json ? info : toJson(info)); + + if (!json) { + // View(jsp)에서 사용할 공통코드를 조회 + Map> commonCodes = getCodesOf("FIM011", "FIM014", "FIM054"); + + mav.addObject("pageName", "payer01020") // jsp pageName + .addObject("FIM011List", commonCodes.get("FIM011")) // 납부자 구분 코드(RTPYR_SE_CD) + .addObject("FIM014List", commonCodes.get("FIM014")) // 납부자 상태 코드(RTPYR_STTS_CD) + .addObject("FIM054List", commonCodes.get("FIM054")) // 업무 구분 코드(TASK_SE_CD) + ; + } + + return mav; } /**납부자 대장를 등록한다. diff --git a/src/main/java/cokr/xit/fims/sprt/SprtQuery.java b/src/main/java/cokr/xit/fims/sprt/SprtQuery.java index e7ab2850..903b69e1 100644 --- a/src/main/java/cokr/xit/fims/sprt/SprtQuery.java +++ b/src/main/java/cokr/xit/fims/sprt/SprtQuery.java @@ -9,7 +9,7 @@ public class SprtQuery extends CmmnQuery { private static final long serialVersionUID = 1L; // 필수 - private String callControlName; // 호출한 페이지의 Control 이름 + private String callPageName; // 호출한 페이지 이름 // IDs private String[] cvlcptDscsnIds; // 민원 상담 Ids private String[] crdnIds; // 단속 Ids @@ -37,12 +37,12 @@ public class SprtQuery extends CmmnQuery { private String delRsn; // 삭제 사유 private String inquiryCondition; // 조회 조건 - public String getCallControlName() { - return ifEmpty(callControlName, () -> null); + public String getCallPageName() { + return ifEmpty(callPageName, () -> null); } - public T setCallControlName(String callControlName) { - this.callControlName = callControlName; + public T setCallPageName(String callPageName) { + this.callPageName = callPageName; return self(); } 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 2a137c7a..c4edcc45 100644 --- a/src/main/java/cokr/xit/fims/sprt/web/Sprt02Controller.java +++ b/src/main/java/cokr/xit/fims/sprt/web/Sprt02Controller.java @@ -123,13 +123,12 @@ public class Sprt02Controller extends ApplicationController { ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/sprt/sprt02010-main"); DataObject info = sprt02Service.getCrdnInfo(req); + mav.addObject("totalInfo", json ? info : toJson(info)); // 개별총정보 return mav - .addObject("callControlName", req.getCallControlName()) - .addObject("callPurpose", req.getCallPurpose()) + .addObject("callPageName", req.getCallPageName()) // 호출 pageName + .addObject("callPurpose", req.getCallPurpose()) // 호출 용도 .addObject("pageName", "sprt02010") // View(jsp)에서 사용할 id 뒤에 붙일 suffix - .addObject("pageNameMain", "sprt02010") // 개별총정보 메인 화면명 - .addObject("totalInfo", json ? info : toJson(info)) // 개별총정보 ; } @@ -156,7 +155,7 @@ public class Sprt02Controller extends ApplicationController { DataObject crdnPayerInfo = sprt02Service.getCrdnPayerInfo(req); return mav - .addObject("mainPageName", "sprt02010") // mainPageName + .addObject("pageNameMain", "sprt02010") // pageNameMain .addObject("pageName", "sprt02020") // pageName .addObject("crdnPayerInfo", json ? crdnPayerInfo : toJson(crdnPayerInfo)) // 단속, 납부자 정보 ; @@ -190,7 +189,7 @@ public class Sprt02Controller extends ApplicationController { DataObject opnnInfo = opnnSbmsnService.getOpnnSbmsnInfo(exclQuery); return mav - .addObject("mainPageName", "sprt02010") // mainPageName + .addObject("pageNameMain", "sprt02010") // pageNameMain .addObject("pageName", "sprt02030") // pageName .addObject("opnnInfo", json ? opnnInfo : toJson(opnnInfo)) // 의견제출 정보 ; @@ -227,7 +226,7 @@ public class Sprt02Controller extends ApplicationController { List svbtcDtls = svbtcService.getSvbtcDtls(sndbQuery); // 공시송달 정보 return mav - .addObject("mainPageName", "sprt02010") // mainPageName + .addObject("pageNameMain", "sprt02010") // pageNameMain .addObject("pageName", "sprt02040") // pageName .addObject("sndngDtls", json ? sndngDtls : toJson(sndngDtls)) // 발송 상세 정보 .addObject("svbtcDtls", json ? svbtcDtls : toJson(svbtcDtls)) // 공시송달 정보 @@ -295,7 +294,7 @@ public class Sprt02Controller extends ApplicationController { List payerAddrHstrys = payerService.getPayerAddrHstrys(payerQuery); return mav - .addObject("mainPageName", "sprt02010") // mainPageName + .addObject("pageNameMain", "sprt02010") // pageNameMain .addObject("pageName", "sprt02050") // pageName .addObject("rdctInfo", json ? rdctInfo : toJson(rdctInfo)) // 과태료 감경 정보 .addObject("levyExclInfo", json ? levyExclInfo : toJson(levyExclInfo)) // 부과 제외 정보 @@ -337,7 +336,7 @@ public class Sprt02Controller extends ApplicationController { DataObject levyInfo = levyService.getLevyInfo(levyQuery); return mav - .addObject("mainPageName", "sprt02010") // mainPageName + .addObject("pageNameMain", "sprt02010") // pageNameMain .addObject("pageName", "sprt02060") // pageName .addObject("levyInfo", json ? levyInfo : toJson(levyInfo)) // 부과 정보 ; @@ -376,7 +375,7 @@ public class Sprt02Controller extends ApplicationController { List rcvmts = rcvmtService.getRcvmts(rcvmtQuery); return mav - .addObject("mainPageName", "sprt02010") // mainPageName + .addObject("pageNameMain", "sprt02010") // pageNameMain .addObject("pageName", "sprt02070") // pageName .addObject("rcvmts", json ? rcvmts : toJson(rcvmts)) // 수납 정보 ; @@ -419,7 +418,7 @@ public class Sprt02Controller extends ApplicationController { List cvlcptDscsns = cvlcptDscsnService.getCvlcptDscsns(cvlcptDscsnQuery); return mav - .addObject("mainPageName", "sprt02010") // mainPageName + .addObject("pageNameMain", "sprt02010") // pageNameMain .addObject("pageName", "sprt02080") // pageName .addObject("cvlcptDscsns", json ? cvlcptDscsns : toJson(cvlcptDscsns)) // 민원상담내용 정보 ;