From 650bfe72cd8b36801b9497aed12590b0f92e47a0 Mon Sep 17 00:00:00 2001 From: jjh Date: Tue, 11 Jun 2024 17:16:07 +0900 Subject: [PATCH] =?UTF-8?q?1.=20=EB=B6=80=EA=B3=BC=20=EB=A9=94=EB=89=B4=20?= =?UTF-8?q?=EC=88=98=EC=A0=95.=202.=20=EA=B8=B0=ED=83=80=20=EC=88=98?= =?UTF-8?q?=EC=A0=95.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cokr/xit/fims/levy/LevyQuery.java | 10 + .../xit/fims/levy/web/Levy02Controller.java | 3 +- .../sql/mapper/fims/excl/crdnReReg-mapper.xml | 50 +- .../sql/mapper/fims/excl/levyExcl-mapper.xml | 12 +- .../sql/mapper/fims/excl/opnnSbmsn-mapper.xml | 6 + .../sql/mapper/fims/levy/levy-mapper.xml | 482 ++++++++++-------- .../sql/mapper/fims/levy/rduct-mapper.xml | 121 +++-- .../WEB-INF/jsp/fims/levy/levy01010-main.jsp | 103 ++-- .../WEB-INF/jsp/fims/levy/levy01020-info.jsp | 15 +- .../WEB-INF/jsp/fims/levy/levy01050-main.jsp | 117 +++-- .../WEB-INF/jsp/fims/levy/levy02010-main.jsp | 108 ++-- .../WEB-INF/jsp/fims/levy/levy02020-info.jsp | 4 +- 12 files changed, 566 insertions(+), 465 deletions(-) diff --git a/src/main/java/cokr/xit/fims/levy/LevyQuery.java b/src/main/java/cokr/xit/fims/levy/LevyQuery.java index 586fcd61..c6a8f516 100644 --- a/src/main/java/cokr/xit/fims/levy/LevyQuery.java +++ b/src/main/java/cokr/xit/fims/levy/LevyQuery.java @@ -32,6 +32,7 @@ public class LevyQuery extends CmmnQuery { private String schLevyYmdTo; // 부과 일자 종료 private String schRductYmdFrom; // 감경 일자 시작 private String schRductYmdTo; // 감경 일자 종료 + private String schRductRsnCd; // 감경 사유 코드 private String schCrdnYmdFrom; // 단속 일자 시작 private String schCrdnYmdTo; // 단속 일자 종료 private String schVhrno; // 차량번호 @@ -135,6 +136,15 @@ public class LevyQuery extends CmmnQuery { return self(); } + public String getSchRductRsnCd() { + return ifEmpty(schRductRsnCd, () -> null); + } + + public T setSchRductRsnCd(String schRductRsnCd) { + this.schRductRsnCd = schRductRsnCd; + return self(); + } + public String getSchFyr() { return ifEmpty(schFyr, () -> null); } diff --git a/src/main/java/cokr/xit/fims/levy/web/Levy02Controller.java b/src/main/java/cokr/xit/fims/levy/web/Levy02Controller.java index 780c7344..4ac77ed9 100644 --- a/src/main/java/cokr/xit/fims/levy/web/Levy02Controller.java +++ b/src/main/java/cokr/xit/fims/levy/web/Levy02Controller.java @@ -82,7 +82,8 @@ public class Levy02Controller extends ApplicationController { // View(jsp)에서 사용할 공통코드를 조회 Map> commonCodes = getCodesOf("FIM010", "FIM019", "FIM054"); - return mav.addObject("pageName", "levy02010") // View(jsp)에서 사용할 id 뒤에 붙일 suffix + return mav + .addObject("pageName", "levy02010") // View(jsp)에서 사용할 id 뒤에 붙일 suffix .addObject("infoPrefix", "rduct") // prefix .addObject("infoPrefixUrl", "/levy/levy02") // prefixUrl .addObject("sggCd", managedUser.getOrgID()) // 시군구 코드(SGG_CD) diff --git a/src/main/resources/sql/mapper/fims/excl/crdnReReg-mapper.xml b/src/main/resources/sql/mapper/fims/excl/crdnReReg-mapper.xml index 2b57952b..0b80af18 100644 --- a/src/main/resources/sql/mapper/fims/excl/crdnReReg-mapper.xml +++ b/src/main/resources/sql/mapper/fims/excl/crdnReReg-mapper.xml @@ -23,31 +23,33 @@ - SELECT CRR.RE_REG_ID - , CRR.BFR_CRDN_ID - , CRR.CRDN_ID - , CRR.RE_REG_YMD - , CRR.CRDN_REG_SE_CD + SELECT CRR.RE_REG_ID + , CRR.BFR_CRDN_ID + , CRR.CRDN_ID + , CRR.RE_REG_YMD + , CRR.CRDN_REG_SE_CD , (SELECT GET_CODE_NM('FIM026', CRR.CRDN_REG_SE_CD) FROM DUAL) AS CRDN_REG_SE_NM - , CRR.ETC_CN - , CRR.DEL_YN - , CRR.REG_DT + , CRR.ETC_CN + , CRR.DEL_YN + , CRR.REG_DT + , CRR.RGTR , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = CRR.RGTR) AS RGTR_NM - , C.SGG_CD - , C.TASK_SE_CD + , C.SGG_CD + , C.TASK_SE_CD , (SELECT GET_CODE_NM('FIM054', C.TASK_SE_CD) FROM DUAL) AS TASK_SE_NM - , C.CRDN_INPT_SE_CD + , C.CRDN_INPT_SE_CD , (SELECT GET_CODE_NM('FIM003', C.CRDN_INPT_SE_CD) FROM DUAL) AS CRDN_INPT_SE_NM + , C.CRDN_YMD , (CONCAT(C.CRDN_YMD, C.CRDN_TM)) AS CRDN_YMD_TM - , C.VHRNO - , C.CRDN_STDG_NM - , C.CRDN_ROAD_NM - , C.CRDN_PLC - , C.ATCH_FILE_CNT - , C.FFNLG_CRDN_AMT - , C.FFNLG_AMT - , C.ADVNTCE_AMT - , C.CRDN_STTS_CD + , C.VHRNO + , C.CRDN_STDG_NM + , C.CRDN_ROAD_NM + , C.CRDN_PLC + , C.ATCH_FILE_CNT + , C.FFNLG_CRDN_AMT + , C.FFNLG_AMT + , C.ADVNTCE_AMT + , C.CRDN_STTS_CD , (SELECT GET_CODE_NM('FIM010', C.CRDN_STTS_CD) FROM DUAL) AS CRDN_STTS_NM , CA.CRDN_SE_CD , (SELECT GET_CODE_NM('FIM002', CA.CRDN_SE_CD) FROM DUAL) AS CRDN_SE_NM @@ -182,14 +184,14 @@ ) - AND CRR.RE_REG_ID= #{reRegId} + AND CRR.RE_REG_ID = #{reRegId} - AND CRR.DEL_YN = #{delYn} + AND CRR.DEL_YN = #{delYn} - AND C.CRDN_ID = #{crdnId} - AND C.DEL_YN = #{delYn} + AND C.CRDN_ID = #{crdnId} + AND C.DEL_YN = #{delYn} diff --git a/src/main/resources/sql/mapper/fims/excl/levyExcl-mapper.xml b/src/main/resources/sql/mapper/fims/excl/levyExcl-mapper.xml index a4998c26..84caee30 100644 --- a/src/main/resources/sql/mapper/fims/excl/levyExcl-mapper.xml +++ b/src/main/resources/sql/mapper/fims/excl/levyExcl-mapper.xml @@ -36,18 +36,21 @@ , (SELECT GET_CODE_NM('FIM022', LE.LEVY_EXCL_RSN_CD) FROM DUAL) AS LEVY_EXCL_RSN_NM , LE.ETC_CN , LE.DEL_YN - , (SELECT GET_CODE_NM('CMN007', LE.DEL_YN) FROM DUAL) AS DEL_YN_NM , LE.REG_DT + , LE.RGTR , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = LE.RGTR) AS RGTR_NM , LE.MDFCN_DT + , LE.MDFR , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = LE.MDFR) AS MDFR_NM , C.CRDN_ID , C.SGG_CD , C.TASK_SE_CD , (SELECT GET_CODE_NM('FIM054', C.TASK_SE_CD) FROM DUAL) AS TASK_SE_NM + , C.CRDN_YMD , (CONCAT(C.CRDN_YMD, C.CRDN_TM)) AS CRDN_YMD_TM , C.VHRNO , C.CRDN_STDG_NM + , C.CRDN_ROAD_NM , C.CRDN_PLC , C.FFNLG_CRDN_AMT , C.CRDN_STTS_CD @@ -236,10 +239,13 @@ AND LE.LEVY_EXCL_ID = #{levyExclId} + + + AND LE.DEL_YN = #{delYn} - AND C.CRDN_ID = #{crdnId} - AND C.DEL_YN = 'N' + AND C.CRDN_ID = #{crdnId} + AND C.DEL_YN = 'N' 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 e30c2842..410de6a3 100644 --- a/src/main/resources/sql/mapper/fims/excl/opnnSbmsn-mapper.xml +++ b/src/main/resources/sql/mapper/fims/excl/opnnSbmsn-mapper.xml @@ -75,13 +75,16 @@ , OS.ANS_CN , OS.DEL_YN , OS.REG_DT + , OS.RGTR , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = OS.RGTR) AS RGTR_NM , OS.MDFCN_DT + , OS.MDFR , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = OS.MDFR) AS MDFR_NM , C.CRDN_ID , C.SGG_CD , C.TASK_SE_CD , (SELECT GET_CODE_NM('FIM054', C.TASK_SE_CD) FROM DUAL) AS TASK_SE_NM + , C.CRDN_YMD , (CONCAT(C.CRDN_YMD, C.CRDN_TM)) AS CRDN_YMD_TM , C.VHRNO , C.CRDN_STDG_NM @@ -316,6 +319,9 @@ AND OS.OPNN_ID = #{opnnId} + + + AND OS.DEL_YN = #{delYn} AND C.CRDN_ID = #{crdnId} diff --git a/src/main/resources/sql/mapper/fims/levy/levy-mapper.xml b/src/main/resources/sql/mapper/fims/levy/levy-mapper.xml index 64a05e34..39c3d0ca 100644 --- a/src/main/resources/sql/mapper/fims/levy/levy-mapper.xml +++ b/src/main/resources/sql/mapper/fims/levy/levy-mapper.xml @@ -107,183 +107,194 @@ - + , P.RTPYR_NO + , P.RTPYR_NM + , PA.ZIP + , PA.ADDR + , PA.DTL_ADDR + , L.LEVY_ID + - + FROM TB_CRDN C INNER JOIN TB_VLTN V ON (C.VLTN_ID = V.VLTN_ID) LEFT OUTER JOIN TB_CRDN_CVLCPT CC ON (C.LINK_ID = CC.CVLCPT_LINK_ID AND C.CVLCPT_LINK_YN = 'Y' AND CC.DEL_YN = 'N') LEFT OUTER JOIN TB_PAYER P ON (C.RTPYR_ID = P.RTPYR_ID) LEFT OUTER JOIN TB_PAYER_ADDR PA ON (C.RTPYR_ID = PA.RTPYR_ID AND C.ADDR_SN = PA.ADDR_SN) LEFT OUTER JOIN TB_LEVY L ON (C.CRDN_ID = L.CRDN_ID AND L.DEL_YN = 'N') - WHERE C.SGG_CD = #{sggCd} - AND C.TASK_SE_CD = #{taskSeCd} - AND (CC.CVLCPT_PRCS_CD IS NULL OR CC.CVLCPT_PRCS_CD ]]> '00') - AND C.CRDN_STTS_CD BETWEEN '21' AND '31' - AND C.RTPYR_ID IS NOT NULL - AND L.LEVY_ID IS NULL - + + AND C.CRDN_ID IN ( - #{crdnId} - ) - - + #{crdnId} + ) + + AND C.CRDN_YMD =]]> #{schCrdnYmdFrom} - - + + AND C.CRDN_YMD #{schCrdnYmdTo} - - + + AND C.VHRNO = #{schVhrno} - - + + AND V.VLTN_CD = #{schVltnCd} - - + + AND CC.CVLCPT_RCPT_YMD =]]> #{schCvlcptRcptYmdFrom} - - + + AND CC.CVLCPT_RCPT_YMD #{schCvlcptRcptYmdTo} - - + + AND CC.CVLCPT_PRCS_CMPTN_DT =]]> CONCAT(#{schCvlcptPrcsCmptnDtFrom},'000000') - - + + AND CC.CVLCPT_PRCS_CMPTN_DT CONCAT(#{schCvlcptPrcsCmptnDtTo},'235959') - - + + AND CC.CVLCPT_PRCS_PIC = #{schCvlcptPrcsPic} - - + + + AND P.RTPYR_NO = #{schRtpyrNo} + + AND P.RTPYR_NM = #{schRtpyrNm} - - AND C.DEL_YN = 'N' - - - + + + + AND C.REG_DT =]]> CONCAT(#{schRegDateFrom},'000000') - - + + AND C.REG_DT CONCAT(#{schRegDateTo},'235959') - - - - + + + + AND C.MDFCN_DT =]]> CONCAT(#{schRegDateFrom},'000000') - - + + AND C.MDFCN_DT CONCAT(#{schRegDateTo},'235959') - - - - - - - - + + + + + + + + AND C.RGTR = #{schRgtrCd} - - - - + + + + AND C.MDFR = #{schRgtrCd} - - - - - - - - - - - C.CRDN_YMD - C.VHRNO - C.CRDN_STDG_NM - C.CRDN_PLC - V.VLTN_ARTCL - C.FFNLG_CRDN_AMT - C.FFNLG_AMT - C.ADVNTCE_AMT - C.CRDN_STTS_CD - CC.CVLCPT_RCPT_YMD - CC.CVLCPT_APLY_NO - CC.CVLCPT_RCPT_NO - CC.CVLCPT_TRSM_CD - P.RTPYR_NM - P.RTPYR_NO - P.RTPYR_BRDT - PA.ZIP - PA.ADDR - P.ADTL_ADDR - - #{term} + - + + + + + + C.CRDN_YMD + C.VHRNO + C.CRDN_STDG_NM + C.CRDN_PLC + C.FFNLG_CRDN_AMT + C.FFNLG_AMT + C.ADVNTCE_AMT + C.CRDN_STTS_CD + P.RTPYR_SE_CD + P.RTPYR_NO + P.RTPYR_NM + PA.ZIP + PA.ADDR + PA.DTL_ADDR + V.VLTN_ARTCL + CC.CVLCPT_RCPT_YMD + CC.CVLCPT_APLY_NO + CC.CVLCPT_RCPT_NO + CC.CVLCPT_TRSM_CD + + #{term} + + + + + + AND C.SGG_CD = #{sggCd} + AND C.TASK_SE_CD = #{taskSeCd} + AND C.CRDN_STTS_CD BETWEEN '21' AND '31' + AND C.RTPYR_ID IS NOT NULL + AND C.DEL_YN = 'N' + AND (CC.CVLCPT_PRCS_CD IS NULL OR CC.CVLCPT_PRCS_CD ]]> '00') + AND L.LEVY_ID IS NULL + + + @@ -389,10 +400,13 @@ , L.NXRP_LEVY_KEY , L.DEL_YN , L.REG_DT + , L.RGTR , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = L.RGTR) AS RGTR_NM , L.MDFCN_DT + , L.MDFR , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = L.MDFR) AS MDFR_NM , C.CRDN_ID + , C.CRDN_YMD , (CONCAT(C.CRDN_YMD, C.CRDN_TM)) AS CRDN_YMD_TM , (GET_MASK_DATETIME(C.CRDN_YMD, '-', C.CRDN_TM, ':')) AS CRDN_YMD_TM_MASK , C.VHRNO @@ -424,108 +438,136 @@ @@ -533,20 +575,20 @@ /* 과태료 감경 대장 객체 가져오기(rductMapper.selectRducts) */ - - AND C.CRDN_ID = #{crdnId} - AND C.DEL_YN = 'N' + + AND R.RDUCT_ID IN ( + #{rductId} + ) AND R.RDUCT_ID = #{rductId} + + AND R.DEL_YN = #{delYn} + + + AND C.CRDN_ID = #{crdnId} + AND C.DEL_YN = 'N' + diff --git a/src/main/webapp/WEB-INF/jsp/fims/levy/levy01010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/levy/levy01010-main.jsp index 81ba3de4..a2a19eab 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/levy/levy01010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/levy/levy01010-main.jsp @@ -37,7 +37,7 @@
- 업무구분 + 업무구분
- 단속일자 + + data-fmt-type="day" autocomplete="off" title="시작 날짜 선택" /> ~ + data-fmt-type="day" autocomplete="off" title="종료 날짜 선택" />
- -
- - -
- -
- +
- 민원접수일자 + + +
+ +
+ + + + + + + + + +
+
+ + + +