From 55ba73668ad78498980548669b8f2fd55afb4141 Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Fri, 14 Jul 2023 16:39:01 +0900 Subject: [PATCH] =?UTF-8?q?=EB=AF=BC=EC=9B=90=20=EC=A1=B0=ED=9A=8C=20?= =?UTF-8?q?=EC=BF=BC=EB=A6=AC=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 | 30 +++++++++++++++++++ .../xit/fims/crdn/web/Crdn01Controller.java | 4 +-- .../cokr/xit/fims/task/CmnController.java | 8 +++++ .../sql/mapper/fims/crdn/crdn01-mapper.xml | 11 +++++-- .../WEB-INF/jsp/fims/crdn/crdn01010-main.jsp | 1 - .../WEB-INF/jsp/fims/crdn/crdn01030-main.jsp | 14 +++++++-- 6 files changed, 61 insertions(+), 7 deletions(-) diff --git a/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java b/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java index ea532709..b96d664f 100644 --- a/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java +++ b/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java @@ -27,6 +27,8 @@ public class CrdnQuery extends QueryRequest { private String schDateFrom; private String schDateTo; private String vhrno; + private String schCvlcptRcptYmdFrom; + private String schCvlcptRcptYmdTo; private String schRductYmdFrom; private String schRductYmdTo; private String schCrdnYmdFrom; @@ -38,6 +40,7 @@ public class CrdnQuery extends QueryRequest { private String schExclEnd; private String schExclTimeout; private String crdnInptSeCd; + private String cvlcptPrcsCd; public String getGrid() { return ifEmpty(grid, () -> null); @@ -138,6 +141,24 @@ public class CrdnQuery extends QueryRequest { return self(); } + public String getSchCvlcptRcptYmdFrom() { + return ifEmpty(schCvlcptRcptYmdFrom, () -> null); + } + + public T setSchCvlcptRcptYmdFrom(String schCvlcptRcptYmdFrom) { + this.schCvlcptRcptYmdFrom = schCvlcptRcptYmdFrom; + return self(); + } + + public String getSchCvlcptRcptYmdTo() { + return ifEmpty(schCvlcptRcptYmdTo, () -> null); + } + + public T setSchCvlcptRcptYmdTo(String schCvlcptRcptYmdTo) { + this.schCvlcptRcptYmdTo = schCvlcptRcptYmdTo; + return self(); + } + public String getSchRductYmdFrom() { return ifEmpty(schRductYmdFrom, () -> null); } @@ -237,4 +258,13 @@ public class CrdnQuery extends QueryRequest { return self(); } + public String getCvlcptPrcsCd() { + return ifEmpty(cvlcptPrcsCd, () -> null); + } + + public T setCvlcptPrcsCd(String cvlcptPrcsCd) { + this.cvlcptPrcsCd = cvlcptPrcsCd; + return self(); + } + } diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn01Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn01Controller.java index be5562b2..7b280170 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn01Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn01Controller.java @@ -12,7 +12,6 @@ import cokr.xit.base.code.CommonCode; import cokr.xit.base.web.ApplicationController; import cokr.xit.fims.crdn.CrdnQuery; import cokr.xit.fims.crdn.service.Crdn01Service; -import cokr.xit.fims.crdn.service.bean.Crdn01ServiceBean; /**민원 관리 서비스 웹 컨트롤러.
* {웹 컨텍스트}/crdn/crdn01 로 접근할 수 있다. @@ -45,7 +44,8 @@ public class Crdn01Controller extends ApplicationController { mav.setViewName("fims/crdn/crdn01030-main"); mav.addObject("pageName", "crdn01030-main"); - Map> commonCodes = getCodesOf("FIM022", "FIM026", "FIM054"); + Map> commonCodes = getCodesOf("FIM017","FIM022", "FIM026", "FIM054"); + mav.addObject("FIM017List", commonCodes.get("FIM017")); mav.addObject("FIM054List", commonCodes.get("FIM054")); addCodes(commonCodes, mav, "FIM022"); addCodes(commonCodes, mav, "FIM026"); diff --git a/src/main/java/cokr/xit/fims/task/CmnController.java b/src/main/java/cokr/xit/fims/task/CmnController.java index 3b2db764..64751ac3 100644 --- a/src/main/java/cokr/xit/fims/task/CmnController.java +++ b/src/main/java/cokr/xit/fims/task/CmnController.java @@ -95,6 +95,14 @@ public class CmnController { return super.tagInformationUndefinedDataMain(); } + /** 과태료 감경 자료 메인화면을 연다. + * @return fims/crdn/crdn06040-main + */ + @Override + @RequestMapping(name="과태료 감경 자료 메인", value="/040/main.do") + public ModelAndView fineReductionDataMain() { + return super.fineReductionDataMain(); + } } @Controller diff --git a/src/main/resources/sql/mapper/fims/crdn/crdn01-mapper.xml b/src/main/resources/sql/mapper/fims/crdn/crdn01-mapper.xml index 4212a945..ed466083 100644 --- a/src/main/resources/sql/mapper/fims/crdn/crdn01-mapper.xml +++ b/src/main/resources/sql/mapper/fims/crdn/crdn01-mapper.xml @@ -172,6 +172,10 @@ SELECT C.CRDN_ID AND C.CRDN_STTS_CD = '01' + + + AND CC.CVLCPT_RCPT_YMD = ]]> #{schCvlcptRcptYmdFrom} + AND CC.CVLCPT_RCPT_YMD #{schCvlcptRcptYmdTo} @@ -204,10 +208,13 @@ SELECT C.CRDN_ID + + AND CC.CVLCPT_RCPT_YMD = ]]> #{schCvlcptRcptYmdFrom} + AND CC.CVLCPT_RCPT_YMD #{schCvlcptRcptYmdTo} + +AND CC.CVLCPT_PRCS_CD = #{cvlcptPrcsCd} - - \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01010-main.jsp index 7b54cea2..2848b2b2 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01010-main.jsp @@ -46,7 +46,6 @@ - diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01030-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01030-main.jsp index 2dcdc8ff..76d66214 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01030-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01030-main.jsp @@ -42,11 +42,21 @@ -
+
+ + +
+
-