From 5cae54f740ae872911caffefacce71922c7749b8 Mon Sep 17 00:00:00 2001 From: jjh Date: Mon, 1 Jul 2024 15:45:18 +0900 Subject: [PATCH] =?UTF-8?q?=EB=A1=A4=EB=B0=B1=20=EC=86=8C=EC=8A=A4=20?= =?UTF-8?q?=EB=B3=B5=EA=B5=AC.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xit/fims/crdn/web/Crdn06Controller.java | 8 +- .../xit/fims/sndb/web/Sndb01Controller.java | 12 +- .../sql/mapper/fims/excl/opnnSbmsn-mapper.xml | 14 +- .../WEB-INF/jsp/fims/crdn/crdn06020-info.jsp | 129 ++-- .../WEB-INF/jsp/fims/crdn/crdn06030-info.jsp | 69 +- .../WEB-INF/jsp/fims/epst/epst02050-main.jsp | 4 +- .../WEB-INF/jsp/fims/levy/levy01010-main.jsp | 2 +- .../WEB-INF/jsp/fims/sndb/sndb01010-main.jsp | 548 ++++++++------- .../WEB-INF/jsp/fims/sndb/sndb01030-main.jsp | 429 ++++++------ .../WEB-INF/jsp/fims/sndb/sndb01040-info.jsp | 28 +- .../WEB-INF/jsp/fims/sndb/sndb01070-main.jsp | 429 ++++++------ .../WEB-INF/jsp/fims/sndb/sndb01080-info.jsp | 26 +- .../WEB-INF/jsp/fims/sndb/sndb01090-main.jsp | 388 ++++++----- .../WEB-INF/jsp/fims/sndb/sndb01110-main.jsp | 455 +++++++------ .../WEB-INF/jsp/fims/sndb/sndb01120-info.jsp | 43 +- .../WEB-INF/jsp/fims/sndb/sndb01220-main.jsp | 591 ++++++++-------- .../WEB-INF/jsp/fims/sndb/sndb01240-main.jsp | 382 ++++++----- .../WEB-INF/jsp/fims/sprt/sprt02010-main.jsp | 631 ++++++++---------- .../WEB-INF/jsp/fims/sprt/sprt02020-info.jsp | 3 +- .../WEB-INF/jsp/fims/sprt/sprt02030-info.jsp | 10 +- .../WEB-INF/jsp/fims/sprt/sprt02040-info.jsp | 5 +- .../WEB-INF/jsp/fims/sprt/sprt02050-info.jsp | 9 +- .../WEB-INF/jsp/fims/sprt/sprt02060-info.jsp | 5 +- .../WEB-INF/jsp/fims/sprt/sprt02070-info.jsp | 1 - .../WEB-INF/jsp/fims/sprt/sprt02080-info.jsp | 1 - 25 files changed, 2049 insertions(+), 2173 deletions(-) diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java index 21619015..0c92459a 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java @@ -315,7 +315,8 @@ public class Crdn06Controller extends ApplicationController { return mav .addObject("openerPageName", hReq.getParameter("openerPageName")) // 호출한 Jsp PageName .addObject("pageName", "crdn06020") // jsp pageName - .addObject("infoPrefixUrl", "/crdn/crdn06") // prefixUrl + .addObject("infoPrefix", "crdn") // prefix + .addObject("infoPrefixUrl", CLASS_URL) // prefixUrl .addObject("crdnInfo", json ? crdnInfo : toJson(crdnInfo)) ; } @@ -366,9 +367,10 @@ public class Crdn06Controller extends ApplicationController { return mav .addObject("openerPageName", hReq.getParameter("openerPageName")) // 호출한 Jsp PageName .addObject("pageName", "crdn06030") // jsp pageName - .addObject("infoPrefixUrl", "/crdn/crdn06") // prefixUrl + .addObject("infoPrefix", "crdnSttsCd") // prefix + .addObject("infoPrefixUrl", CLASS_URL) // prefixUrl .addObject("FIM010List", commonCodes.get("FIM010")) // 단속 처리 상태 코드(CRDN_STTS_CD) - .addObject("crdnInfo", json ? crdnInfo : toJson(crdnInfo)) + .addObject("crdnSttsCdInfo", json ? crdnInfo : toJson(crdnInfo)) ; } 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 ae829c07..a9a6ee65 100644 --- a/src/main/java/cokr/xit/fims/sndb/web/Sndb01Controller.java +++ b/src/main/java/cokr/xit/fims/sndb/web/Sndb01Controller.java @@ -435,7 +435,9 @@ public class Sndb01Controller extends ApplicationController { .addObject("pageName", "sndb01040") // View(jsp)에서 사용할 id 뒤에 붙일 suffix .addObject("infoPrefix", "wrngSndngDtl") // prefix .addObject("infoPrefixUrl", CLASS_URL) // prefixUrl - .addObject("mainQuery", toJson(req)) // 검색 조건 + .addObject("sggCd", req.getSggCd()) // 시군구 코드(SGG_CD) + .addObject("taskSeCd", req.getTaskSeCd()) // 업무 구분 코드(TASK_SE_CD) + .addObject("sndngId", req.getSndngId()) // 발송 ID(SNDNG_ID) .addObject("wrngSndngDtlList", toJson(mav.getModel().get("wrngSndngDtlList"))) // 자료 ; } @@ -767,7 +769,9 @@ public class Sndb01Controller extends ApplicationController { .addObject("pageName", "sndb01080") // View(jsp)에서 사용할 id 뒤에 붙일 suffix .addObject("infoPrefix", "advntceSndngDtl") // prefix .addObject("infoPrefixUrl", CLASS_URL) // prefixUrl - .addObject("mainQuery", toJson(req)) // 검색 조건 + .addObject("sggCd", req.getSggCd()) // 시군구 코드(SGG_CD) + .addObject("taskSeCd", req.getTaskSeCd()) // 업무 구분 코드(TASK_SE_CD) + .addObject("sndngId", req.getSndngId()) // 발송 ID(SNDNG_ID) .addObject("advntceSndngDtlList", toJson(mav.getModel().get("advntceSndngDtlList"))) // 자료 ; } @@ -1150,7 +1154,9 @@ public class Sndb01Controller extends ApplicationController { .addObject("pageName", "sndb01120") // View(jsp)에서 사용할 id 뒤에 붙일 suffix .addObject("infoPrefix", "nhtSndngDtl") // prefix .addObject("infoPrefixUrl", CLASS_URL) // prefixUrl - .addObject("mainQuery", toJson(req)) // 검색 조건 + .addObject("sggCd", req.getSggCd()) // 시군구 코드(SGG_CD) + .addObject("taskSeCd", req.getTaskSeCd()) // 업무 구분 코드(TASK_SE_CD) + .addObject("sndngId", req.getSndngId()) // 발송 ID(SNDNG_ID) .addObject("nhtSndngDtlList", toJson(mav.getModel().get("nhtSndngDtlList"))) // 자료 ; } diff --git a/src/main/resources/sql/mapper/fims/excl/opnnSbmsn-mapper.xml b/src/main/resources/sql/mapper/fims/excl/opnnSbmsn-mapper.xml index f785405d..6b16fbb9 100644 --- a/src/main/resources/sql/mapper/fims/excl/opnnSbmsn-mapper.xml +++ b/src/main/resources/sql/mapper/fims/excl/opnnSbmsn-mapper.xml @@ -163,13 +163,6 @@ AND P.RTPYR_NM = #{schRtpyrNm} - - AND C.SGG_CD = #{sggCd} - - - AND C.TASK_SE_CD = #{taskSeCd} - - AND C.DEL_YN = 'N' @@ -242,6 +235,9 @@ + AND C.SGG_CD = #{sggCd} + AND C.TASK_SE_CD = #{taskSeCd} + AND C.DEL_YN = 'N' @@ -400,8 +396,8 @@ SELECT CONCAT(#{sggCd}, DATE_FORMAT(CURRENT_DATE, '%Y'), LPAD(CAST(IFNULL(MAX(SUBSTRING(OPNN_ID, 10)) + 1, 1) AS INT), 11, '0')) AS NEW_ID , (SELECT CONCAT(DATE_FORMAT(CURRENT_DATE, '%Y'), LPAD(CAST(IFNULL(MAX(SUBSTRING(RCPT_NO, 5)) + 1, 1) AS INT), 6, '0')) FROM TB_OPNN_SBMSN - WHERE OPNN_ID LIKE CONCAT(#{opnnSbmsn.sggCd}, DATE_FORMAT(CURRENT_DATE, '%Y'), '%') - AND RCPT_NO LIKE CONCAT(DATE_FORMAT(CURRENT_DATE, '%Y'), '%')) AS NEW_RCPT_NO + WHERE OPNN_ID LIKE CONCAT(#{sggCd}, DATE_FORMAT(CURRENT_DATE, '%Y'), '%') + AND RCPT_NO LIKE CONCAT(DATE_FORMAT(CURRENT_DATE, '%Y'), '%')) AS NEW_RCPT_NO FROM TB_OPNN_SBMSN WHERE OPNN_ID LIKE CONCAT(#{sggCd}, DATE_FORMAT(CURRENT_DATE, '%Y'), '%') diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-info.jsp index 4239fd50..23b22866 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-info.jsp @@ -1,21 +1,21 @@ <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" isELIgnored="false" session="false"%> <%@ include file="/WEB-INF/jsp/include/taglib.jsp"%> -단속자료 수정 +단속 자료 수정 -
+
+
-
- +
@@ -39,16 +39,12 @@
- +
- - @@ -56,10 +52,7 @@
- + @@ -70,19 +63,13 @@
- +
- +
@@ -90,10 +77,7 @@