From 080e3b75e567b2ed2c0fbe5b4c6a317de0687fae Mon Sep 17 00:00:00 2001 From: jjh Date: Mon, 1 Jul 2024 14:38:22 +0900 Subject: [PATCH] =?UTF-8?q?=EB=AF=BC=EC=9B=90=20=EA=B2=80=EC=83=89?= =?UTF-8?q?=EC=A1=B0=EA=B1=B4=20jsp=20=EC=88=98=EC=A0=95.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cokr/xit/fims/crdn/CrdnQuery.java | 20 ++ .../xit/fims/cvlc/web/Cvlc03Controller.java | 3 + .../mapper/fims/cvlc/crdnCvlcpt-mapper.xml | 54 ++-- .../WEB-INF/jsp/fims/cvlc/cvlc01010-main.jsp | 253 +++++++++--------- .../WEB-INF/jsp/fims/cvlc/cvlc02010-main.jsp | 160 ++++++----- .../WEB-INF/jsp/fims/cvlc/cvlc03010-main.jsp | 141 +++++----- .../WEB-INF/jsp/fims/cvlc/cvlc04010-main.jsp | 136 +++++----- .../WEB-INF/jsp/fims/cvlc/cvlc05010-main.jsp | 200 +++++++------- .../WEB-INF/jsp/fims/cvlc/cvlc06010-main.jsp | 89 +++--- 9 files changed, 556 insertions(+), 500 deletions(-) diff --git a/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java b/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java index e5cbd2ab..d57e6780 100644 --- a/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java +++ b/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java @@ -36,6 +36,8 @@ public class CrdnQuery extends CmmnQuery { private String aplcnYmd; private String schCvlcptRcptYmdFrom; private String schCvlcptRcptYmdTo; + private String schCvlcptPrcsPrnmntDtFrom; + private String schCvlcptPrcsPrnmntDtTo; private String schRductYmdFrom; private String schRductYmdTo; private String crdnYmd; @@ -198,6 +200,24 @@ public class CrdnQuery extends CmmnQuery { return self(); } + public String getSchCvlcptPrcsPrnmntDtFrom() { + return ifEmpty(schCvlcptPrcsPrnmntDtFrom, () -> null); + } + + public T setSchCvlcptPrcsPrnmntDtFrom(String schCvlcptPrcsPrnmntDtFrom) { + this.schCvlcptPrcsPrnmntDtFrom = schCvlcptPrcsPrnmntDtFrom; + return self(); + } + + public String getSchCvlcptPrcsPrnmntDtTo() { + return ifEmpty(schCvlcptPrcsPrnmntDtTo, () -> null); + } + + public T setSchCvlcptPrcsPrnmntDtTo(String schCvlcptPrcsPrnmntDtTo) { + this.schCvlcptPrcsPrnmntDtTo = schCvlcptPrcsPrnmntDtTo; + return self(); + } + public String getSchRductYmdFrom() { return ifEmpty(schRductYmdFrom, () -> null); } diff --git a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc03Controller.java b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc03Controller.java index 0e82e34a..326174d9 100644 --- a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc03Controller.java +++ b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc03Controller.java @@ -26,6 +26,7 @@ import cokr.xit.fims.crdn.CrdnQuery; import cokr.xit.fims.crdn.service.CrdnService; import cokr.xit.fims.cvlc.service.CrdnCvlcptService; import cokr.xit.fims.task.Task; +import cokr.xit.foundation.UserInfo; import cokr.xit.foundation.data.DataObject; /**민원관리 서비스 웹 컨트롤러.
@@ -70,6 +71,8 @@ public class Cvlc03Controller extends ApplicationController { mav.addObject("FIM054List", commonCodes.get("FIM054")); mav.addObject("TaskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))); addCodes(commonCodes, mav, "FIM022", "FIM026"); + mav.addObject("currentUserName", UserInfo.current().getName()); + return mav; } diff --git a/src/main/resources/sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml b/src/main/resources/sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml index b8688faf..ea12c5ad 100644 --- a/src/main/resources/sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml +++ b/src/main/resources/sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml @@ -174,14 +174,18 @@ WHERE C.DEL_YN = 'N' AND CC.CVLCPT_PRCS_PIC_NM = #{cvlcptPrcsPicNm} - - - AND SUBSTR(C.REG_DT,1,8) = ]]> #{schDateFrom} - AND SUBSTR(C.REG_DT,1,8) #{schDateTo} + + AND CC.CVLCPT_PRCS_PRNMNT_DT = ]]> #{schCvlcptPrcsPrnmntDtFrom} + AND CC.CVLCPT_PRCS_PRNMNT_DT #{schCvlcptPrcsPrnmntDtTo} + + + + AND SUBSTR(C.REG_DT,1,8) = ]]> #{schRegDateFrom} + AND SUBSTR(C.REG_DT,1,8) #{schRegDateTo} - - AND SUBSTR(C.MDFCN_DT,1,8) = ]]> #{schDateFrom} - AND SUBSTR(C.MDFCN_DT,1,8) #{schDateTo} + + AND SUBSTR(C.MDFCN_DT,1,8) = ]]> #{schRegDateFrom} + AND SUBSTR(C.MDFCN_DT,1,8) #{schRegDateTo} @@ -255,14 +259,18 @@ SELECT C.CRDN_ID AND CC.CVLCPT_PRCS_PIC_NM = #{cvlcptPrcsPicNm} - - - AND SUBSTR(C.REG_DT,1,8) = ]]> #{schDateFrom} - AND SUBSTR(C.REG_DT,1,8) #{schDateTo} + + AND CC.CVLCPT_PRCS_PRNMNT_DT = ]]> #{schCvlcptPrcsPrnmntDtFrom} + AND CC.CVLCPT_PRCS_PRNMNT_DT #{schCvlcptPrcsPrnmntDtTo} + + + + AND SUBSTR(C.REG_DT,1,8) = ]]> #{schRegDateFrom} + AND SUBSTR(C.REG_DT,1,8) #{schRegDateTo} - - AND SUBSTR(C.MDFCN_DT,1,8) = ]]> #{schDateFrom} - AND SUBSTR(C.MDFCN_DT,1,8) #{schDateTo} + + AND SUBSTR(C.MDFCN_DT,1,8) = ]]> #{schRegDateFrom} + AND SUBSTR(C.MDFCN_DT,1,8) #{schRegDateTo} @@ -450,14 +458,18 @@ SELECT C.CRDN_ID AND CC.CVLCPT_RCPT_YMD #{schCvlcptRcptYmdTo} AND CC.CVLCPT_PRCS_CD = #{cvlcptPrcsCd} - - - AND SUBSTR(C.REG_DT,1,8) = ]]> #{schDateFrom} - AND SUBSTR(C.REG_DT,1,8) #{schDateTo} + + AND CC.CVLCPT_PRCS_PRNMNT_DT = ]]> #{schCvlcptPrcsPrnmntDtFrom} + AND CC.CVLCPT_PRCS_PRNMNT_DT #{schCvlcptPrcsPrnmntDtTo} + + + + AND SUBSTR(C.REG_DT,1,8) = ]]> #{schRegDateFrom} + AND SUBSTR(C.REG_DT,1,8) #{schRegDateTo} - - AND SUBSTR(C.MDFCN_DT,1,8) = ]]> #{schDateFrom} - AND SUBSTR(C.MDFCN_DT,1,8) #{schDateTo} + + AND SUBSTR(C.MDFCN_DT,1,8) = ]]> #{schRegDateFrom} + AND SUBSTR(C.MDFCN_DT,1,8) #{schRegDateTo} diff --git a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01010-main.jsp index b056b0b4..9a2578c4 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01010-main.jsp @@ -22,8 +22,8 @@
@@ -99,13 +110,13 @@
-
- @@ -118,7 +129,7 @@