From 991cbdaf7ac563f1b524a8eb5bc68b442146ea64 Mon Sep 17 00:00:00 2001 From: jjh Date: Thu, 23 Nov 2023 18:37:54 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B3=A0=EC=A7=80=EC=84=9C=20=EB=B0=9C?= =?UTF-8?q?=EC=86=A1=20=ED=98=84=ED=99=A9=20-=20=EC=8B=A0=EA=B7=9C=20?= =?UTF-8?q?=EB=B0=9C=EC=86=A1=20=EB=93=B1=EB=A1=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/sndb/web/Sndb01Controller.java | 15 +- .../cokr/xit/fims/task/web/DpvController.java | 4 +- .../WEB-INF/jsp/fims/excl/excl01010-main.jsp | 6 +- .../WEB-INF/jsp/fims/sndb/sndb01010-main.jsp | 12 +- .../WEB-INF/jsp/fims/sndb/sndb01090-main.jsp | 12 +- .../WEB-INF/jsp/fims/sndb/sndb01100-info.jsp | 2 +- .../WEB-INF/jsp/fims/sndb/sndb01110-info.jsp | 561 +++++++----------- 7 files changed, 227 insertions(+), 385 deletions(-) diff --git a/src/main/java/cokr/xit/fims/sndb/web/Sndb01Controller.java b/src/main/java/cokr/xit/fims/sndb/web/Sndb01Controller.java index 4e1574dc..1e9ce7f9 100644 --- a/src/main/java/cokr/xit/fims/sndb/web/Sndb01Controller.java +++ b/src/main/java/cokr/xit/fims/sndb/web/Sndb01Controller.java @@ -460,24 +460,23 @@ public class Sndb01Controller extends ApplicationController { ; } - /**고지서 발송 대상 자료 정보 화면(sndb/sndb01/110-info)을 연다. + /**고지서 대상 자료 정보 화면(sndb/sndb01/110-info)을 연다. * * @return /sndb/sndb01/110-info */ - public ModelAndView noticeSheetSendingTargetInfo() { + public ModelAndView noticeSheetSendingTargetInfo(SndbQuery req) { ModelAndView mav = new ModelAndView("fims/sndb/sndb01110-info"); - // 사용자 정보 - ManagedUser managedUser = (ManagedUser)currentUser().getUser(); - // View(jsp)에서 사용할 공통코드를 조회 - Map> commonCodes = getCodesOf("FIM004", "FIM005", "FIM006", "FIM054", "FIM061", "FIM064"); + Map> commonCodes = getCodesOf("FIM004", "FIM005", "FIM006", "FIM047", "FIM054", "FIM061", "FIM064"); addCodes(commonCodes, mav, "FIM004", "FIM005", "FIM006", "FIM061", "FIM064"); return mav.addObject("pageName", "sndb01110") // View(jsp)에서 사용할 id 뒤에 붙일 suffix - .addObject("infoPrefix", "nhtSndngTrgt") // prefix - .addObject("sggCd", managedUser.getOrgID()) // 시군구 코드(SGG_CD) + .addObject("infoPrefix", "levyTrgt") // prefix + .addObject("sggCd", req.getSggCd()) // 시군구 코드(SGG_CD) + .addObject("taskSeCd", req.getTaskSeCd()) // 업무 구분 코드(TASK_SE_CD) + .addObject("FIM047List", commonCodes.get("FIM047")) // 발송 구분 코드(SNDNG_SE_CD) .addObject("FIM054List", commonCodes.get("FIM054")) // 업무 구분 코드(TASK_SE_CD) .addObject("FIM004List", commonCodes.get("FIM004")) // 주정차위반 내역 코드(VLTN_ID) .addObject("FIM005List", commonCodes.get("FIM005")) // 전용차로위반 내역 코드(VLTN_ID) 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 71b08642..23eb4575 100644 --- a/src/main/java/cokr/xit/fims/task/web/DpvController.java +++ b/src/main/java/cokr/xit/fims/task/web/DpvController.java @@ -602,8 +602,8 @@ public class DpvController { @Override @RequestMapping(name = "고지서 발송 대상", value = METHOD_URL.noticeSheetSendingTargetInfo) - public ModelAndView noticeSheetSendingTargetInfo() { - return super.noticeSheetSendingTargetInfo(); + public ModelAndView noticeSheetSendingTargetInfo(SndbQuery req) { + return super.noticeSheetSendingTargetInfo(req); } @Override diff --git a/src/main/webapp/WEB-INF/jsp/fims/excl/excl01010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/excl/excl01010-main.jsp index bc8f9369..5d100ae7 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/excl/excl01010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/excl/excl01010-main.jsp @@ -560,9 +560,9 @@ // 검색조건 ${pageName}Control.query = ${pageName}Fields.get(); - ${pageName}Control.query.fetchSize = FETCH_XS; // 한번에 조회되는 자료 건수 FETCH_XS = 30 - ${pageName}Control.query.delYn = "N"; // 삭제 여부 - ${pageName}Control.query.crdnDelYn = "N"; // 단속 대장 삭제 여부 + ${pageName}Control.query.fetchSize = FETCH_XS; // 한번에 조회되는 자료 건수 FETCH_XS = 30 + ${pageName}Control.query.delYn = "N"; // 삭제 여부 + ${pageName}Control.query.crdnDelYn = "N"; // 단속 대장 삭제 여부 ${pageName}Control.load(); } diff --git a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01010-main.jsp index 216efbc1..14e98128 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01010-main.jsp @@ -64,12 +64,12 @@
- +
diff --git a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01090-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01090-main.jsp index 9463b9fb..545f279e 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01090-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01090-main.jsp @@ -315,9 +315,9 @@ , success : resp => { dialog.open({ id : ${pageName}Control.prefixed("Dialog") - , title : ${pageName}Control.prefixName + " 정보" + , title :"고지서 발송 대상" , content : resp - , size : "xl" + , size : "lg" , onClose : () => { ${pageName}Control.load(${pageName}Control.query.pageNum); } // callback }); } @@ -448,9 +448,11 @@ // 신규 등록 fnNhtSndngInfo${pageName} = () => { - let params = ${pageName}Fields.get(); - - params.callPurpose = "create"; + let params = { + callPurpose : "create" + , sggCd : $("#sggCd--${pageName}").val() // 시군구 코드 + , taskSeCd : $(":input:radio[name='taskSeCd']:checked").val() // 업무 구분 코드 + }; getNhtSndngInfo${pageName}(params); } diff --git a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01100-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01100-info.jsp index eebe3280..c232bde7 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01100-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01100-info.jsp @@ -60,7 +60,7 @@ 주소 상세주소 단속일시 - 차량번호 + 차량번호 법정동 단속장소 회계연도 diff --git a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01110-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01110-info.jsp index d9d448c1..0c05cd4a 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01110-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01110-info.jsp @@ -9,122 +9,136 @@
-
- -
- - -
- - -
- - - - - - - - - - - - + +
+ + + + + +
+ + +
+ + + + +
+ +
+ + +
+ +
+ + +
+ +
+ + + +
+ +
+ + +
+ +
+ + + +
+ +
+ + +
+ +
+ + ~ + +
- - - -
- + +

+ +
+ +
+
+ +
+ + +
+ +
+ + +
+ +
+ + + +
+ +
+ + + +
+ +
+ + +
+ +
+ +
- -
+ + +
+ + + + + + +
+
-
- +