From 75103733d82caa7f27eaf9a48d087bee354b467e Mon Sep 17 00:00:00 2001 From: jjh Date: Mon, 25 Sep 2023 18:21:41 +0900 Subject: [PATCH] =?UTF-8?q?=EB=82=A9=EB=B6=80=EC=9E=90=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD=EC=9D=B4=EB=A0=A5=20=EC=A1=B0=ED=9A=8C=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xit/fims/payer/service/PayerService.java | 2 +- .../fims/payer/service/bean/PayerBean.java | 4 ++-- .../payer/service/bean/PayerServiceBean.java | 4 ++-- .../xit/fims/payer/web/PayerController.java | 21 ++++++++++++++++--- .../cokr/xit/fims/task/web/BpvController.java | 12 ++++++++--- .../cokr/xit/fims/task/web/DpvController.java | 12 ++++++++--- .../cokr/xit/fims/task/web/EcaController.java | 12 ++++++++--- .../cokr/xit/fims/task/web/PvsController.java | 12 ++++++++--- .../jsp/fims/payer/payer01020-info.jsp | 6 +++--- 9 files changed, 62 insertions(+), 23 deletions(-) diff --git a/src/main/java/cokr/xit/fims/payer/service/PayerService.java b/src/main/java/cokr/xit/fims/payer/service/PayerService.java index 30db0a7b..3cf9f3a3 100644 --- a/src/main/java/cokr/xit/fims/payer/service/PayerService.java +++ b/src/main/java/cokr/xit/fims/payer/service/PayerService.java @@ -73,7 +73,7 @@ public interface PayerService { *
  • 그렇지 않으면 false
    • * */ - String createPayer(Payer payer); + String createCrdnPayer(Payer payer); /**지정한 조건에 따라 납부자 변경 이력 목록을 조회하여 반환한다. * @param req 납부자 대장 조회 조건 diff --git a/src/main/java/cokr/xit/fims/payer/service/bean/PayerBean.java b/src/main/java/cokr/xit/fims/payer/service/bean/PayerBean.java index 0d678cb5..7dfbec58 100644 --- a/src/main/java/cokr/xit/fims/payer/service/bean/PayerBean.java +++ b/src/main/java/cokr/xit/fims/payer/service/bean/PayerBean.java @@ -196,14 +196,14 @@ public class PayerBean extends AbstractComponent { return dataCrdn; } - /**납부자 정보를 등록한다. + /**납부자 정보를 등록하고, 단속 정보에 납부자 ID를 변경한다. * @param payer 납부자 * @return 저장 여부 * */ - public String createPayer(Payer payer) { + public String createCrdnPayer(Payer payer) { // 변수 선언 boolean retSuccess = false; // DB 처리 결과 String retMessage = "[F] "; // 처리 결과 메시지 diff --git a/src/main/java/cokr/xit/fims/payer/service/bean/PayerServiceBean.java b/src/main/java/cokr/xit/fims/payer/service/bean/PayerServiceBean.java index 69bbf443..aad2c8dc 100644 --- a/src/main/java/cokr/xit/fims/payer/service/bean/PayerServiceBean.java +++ b/src/main/java/cokr/xit/fims/payer/service/bean/PayerServiceBean.java @@ -74,8 +74,8 @@ public class PayerServiceBean extends AbstractServiceBean implements PayerServic } @Override - public String createPayer(Payer payer) { - return payerBean.createPayer(payer); + public String createCrdnPayer(Payer payer) { + return payerBean.createCrdnPayer(payer); } @Override 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 c2c60b0f..87cb369c 100644 --- a/src/main/java/cokr/xit/fims/payer/web/PayerController.java +++ b/src/main/java/cokr/xit/fims/payer/web/PayerController.java @@ -38,7 +38,8 @@ public class PayerController extends ApplicationController { , remove = "/remove.do" // 납부자 제거 , getVehicleOwner = "/vehicle.do" // 차량/납부자 조회 , getPayerInfo = "/info.do" // 납부자 정보 조회 - , createPayer = "/createPayer.do" // 납부자 대장 등록 + , createCrdnPayer = "/createCrdnPayer.do" // 단속, 납부자 대장 등록 + , getPayerHstrys = "/getPayerHstrys.do" // 납부자 변경 이력 조회 ; } @@ -161,9 +162,9 @@ public class PayerController extends ApplicationController { * "saved": 등록되었으면 true, 그렇지 않으면 false * } */ - public ModelAndView createPayer(Payer payer) { + public ModelAndView createCrdnPayer(Payer payer) { boolean saved = false; - String retMessage = payerService.createPayer(payer); + String retMessage = payerService.createCrdnPayer(payer); if (retMessage.contains("[S]")) { saved = true; @@ -176,4 +177,18 @@ public class PayerController extends ApplicationController { .addObject("retMessage", retMessage); } + /**납부자 변경 이력을 조회하여 반환한다.
    + * {@link PayerService#getPayerList(PayerQuery)} 참고 + * @param req 납부자 조회 조건 + * @return jsonView + * 
     {
+	 *     "payerList": [납부자 변경 이력 목록]
+	 * }
    + */ + public ModelAndView getPayerHstrys(PayerQuery req) { + List result = payerService.getPayerHstrys(req); + + return setCollectionInfo(new ModelAndView("jsonView"), result, "payerHstry"); + } + } diff --git a/src/main/java/cokr/xit/fims/task/web/BpvController.java b/src/main/java/cokr/xit/fims/task/web/BpvController.java index d882d2f3..26c802e2 100644 --- a/src/main/java/cokr/xit/fims/task/web/BpvController.java +++ b/src/main/java/cokr/xit/fims/task/web/BpvController.java @@ -584,9 +584,15 @@ public class BpvController { } @Override - @RequestMapping(name="전용차로과태료업무 납부자 등록", value=METHOD_URL.createPayer) - public ModelAndView createPayer(Payer payer) { - return super.createPayer(payer); + @RequestMapping(name="전용차로과태료업무 납부자 등록", value=METHOD_URL.createCrdnPayer) + public ModelAndView createCrdnPayer(Payer payer) { + return super.createCrdnPayer(payer); + } + + @Override + @RequestMapping(name="전용차로과태료업무 납부자 변경 이력 조회", value=METHOD_URL.getPayerHstrys) + public ModelAndView getPayerHstrys(PayerQuery req) { + return super.getPayerHstrys(req); } } diff --git a/src/main/java/cokr/xit/fims/task/web/DpvController.java b/src/main/java/cokr/xit/fims/task/web/DpvController.java index 747e6abc..a7163627 100644 --- a/src/main/java/cokr/xit/fims/task/web/DpvController.java +++ b/src/main/java/cokr/xit/fims/task/web/DpvController.java @@ -618,9 +618,15 @@ public class DpvController { } @Override - @RequestMapping(name="장애인과태료업무 납부자 등록", value=METHOD_URL.createPayer) - public ModelAndView createPayer(Payer payer) { - return super.createPayer(payer); + @RequestMapping(name="장애인과태료업무 납부자 등록", value=METHOD_URL.createCrdnPayer) + public ModelAndView createCrdnPayer(Payer payer) { + return super.createCrdnPayer(payer); + } + + @Override + @RequestMapping(name="장애인과태료업무 납부자 변경 이력 조회", value=METHOD_URL.getPayerHstrys) + public ModelAndView getPayerHstrys(PayerQuery req) { + return super.getPayerHstrys(req); } } diff --git a/src/main/java/cokr/xit/fims/task/web/EcaController.java b/src/main/java/cokr/xit/fims/task/web/EcaController.java index 525c859c..5c36f6d6 100644 --- a/src/main/java/cokr/xit/fims/task/web/EcaController.java +++ b/src/main/java/cokr/xit/fims/task/web/EcaController.java @@ -590,9 +590,15 @@ public class EcaController { } @Override - @RequestMapping(name="전기차과태료업무 납부자 등록", value=METHOD_URL.createPayer) - public ModelAndView createPayer(Payer payer) { - return super.createPayer(payer); + @RequestMapping(name="전기차과태료업무 납부자 등록", value=METHOD_URL.createCrdnPayer) + public ModelAndView createCrdnPayer(Payer payer) { + return super.createCrdnPayer(payer); + } + + @Override + @RequestMapping(name="전기차과태료업무 납부자 변경 이력 조회", value=METHOD_URL.getPayerHstrys) + public ModelAndView getPayerHstrys(PayerQuery req) { + return super.getPayerHstrys(req); } } diff --git a/src/main/java/cokr/xit/fims/task/web/PvsController.java b/src/main/java/cokr/xit/fims/task/web/PvsController.java index 63bc3a10..9745fb54 100644 --- a/src/main/java/cokr/xit/fims/task/web/PvsController.java +++ b/src/main/java/cokr/xit/fims/task/web/PvsController.java @@ -595,9 +595,15 @@ public class PvsController { } @Override - @RequestMapping(name="주정차과태료업무 납부자 등록", value=METHOD_URL.createPayer) - public ModelAndView createPayer(Payer payer) { - return super.createPayer(payer); + @RequestMapping(name="주정차과태료업무 납부자 등록", value=METHOD_URL.createCrdnPayer) + public ModelAndView createCrdnPayer(Payer payer) { + return super.createCrdnPayer(payer); + } + + @Override + @RequestMapping(name="주정차과태료업무 납부자 변경 이력 조회", value=METHOD_URL.getPayerHstrys) + public ModelAndView getPayerHstrys(PayerQuery req) { + return super.getPayerHstrys(req); } } diff --git a/src/main/webapp/WEB-INF/jsp/fims/payer/payer01020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/payer/payer01020-info.jsp index 816ce37d..7eba2c5b 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/payer/payer01020-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/payer/payer01020-info.jsp @@ -150,8 +150,8 @@ , keymapper : info => info ? info.RTPYR_ID : "" , dataGetter : obj => obj.payerInfo , urls : { - create : wctx.url(${pageName}PrefixUrl + "/createPayer.do") // 등록 - , update : wctx.url(${pageName}PrefixUrl + "/updatePayer.do") // 수정 + create : wctx.url(${pageName}PrefixUrl + "/createCrdnPayer.do") // 등록 + , update : wctx.url(${pageName}PrefixUrl + "/update.do") // 수정 } , formats : { CRDN_YMD_TM : datetimeFormat @@ -163,7 +163,7 @@ ${pageName}Fields.set(item); // 업무구분에 따른 url 변경 - ${pageName}Control.urls.create = wctx.url(item.data.TASK_SE_CD + ${pageName}PrefixUrl + "/createPayer.do"); + ${pageName}Control.urls.create = wctx.url(item.data.TASK_SE_CD + ${pageName}PrefixUrl + "/createCrdnPayer.do"); ${pageName}Control.urls.update = wctx.url(item.data.TASK_SE_CD + ${pageName}PrefixUrl + "/update.do"); }