diff --git a/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java b/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java index 5364b993..122a5b21 100644 --- a/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java +++ b/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java @@ -65,6 +65,7 @@ public class CrdnQuery extends CmmnQuery { //YN private String dstrbncYn; + private String towngYn; //기타 private String vhrno; @@ -151,6 +152,15 @@ public class CrdnQuery extends CmmnQuery { return self(); } + public String getTowngYn() { + return ifEmpty(towngYn, () -> null); + } + + public T setTowngYn(String towngYn) { + this.towngYn = towngYn; + return self(); + } + public String getVhrno() { return ifEmpty(vhrno, () -> null); } 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 4cc9b687..ce1274cc 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java @@ -42,12 +42,13 @@ public class Crdn06Controller extends ApplicationController { mav.setViewName("fims/crdn/crdn06010-main"); mav.addObject("pageName", "crdn06010-main"); - Map> commonCodes = getCodesOf("FIM002", "FIM003", "FIM005", "FIM010", "FIM022", "FIM026", "FIM054"); + Map> commonCodes = getCodesOf("FIM002", "FIM003", "FIM005", "FIM010", "FIM022", "FIM026", + "FIM034", "FIM054"); mav.addObject("FIM003List", commonCodes.get("FIM003")); mav.addObject("FIM005List", commonCodes.get("FIM005")); mav.addObject("FIM010List", commonCodes.get("FIM010")); mav.addObject("FIM054List", commonCodes.get("FIM054")); - addCodes(commonCodes, mav, "FIM002", "FIM003", "FIM010", "FIM022", "FIM026"); + addCodes(commonCodes, mav, "FIM002", "FIM003", "FIM010", "FIM022", "FIM026", "FIM034"); return mav; } diff --git a/src/main/resources/sql/mapper/fims/crdn/crdn-list-mapper.xml b/src/main/resources/sql/mapper/fims/crdn/crdn-list-mapper.xml index 7157025e..86a61794 100644 --- a/src/main/resources/sql/mapper/fims/crdn/crdn-list-mapper.xml +++ b/src/main/resources/sql/mapper/fims/crdn/crdn-list-mapper.xml @@ -17,7 +17,6 @@ SELECT C.CRDN_ID , C.CRDN_YMD , C.CRDN_TM , CONCAT(C.CRDN_YMD,'',C.CRDN_TM) AS CRDN_YMD_TM - , '' AS APLCNT_CRDN_NM , C.VHRNO , C.CRDN_STDG_NM , C.CRDN_ROAD_NM @@ -99,16 +98,6 @@ LEFT OUTER JOIN TB_CRDN_CVLCPT CC ON (C.CVLCPT_LINK_YN = 'Y' AND C.LINK_ID = CC. LEFT OUTER JOIN TB_LEVY_EXCL LE ON (C.CRDN_ID = LE.CRDN_ID AND LE.DEL_YN = 'N') LEFT OUTER JOIN TB_LEVY L ON (C.LEVY_ID = L.LEVY_ID) WHERE C.DEL_YN = 'N' - - - -AND FN_GET_CODE_NM('FIM003', C.CRDN_INPT_SE_CD) LIKE CONCAT('%', #{term}, '%') - - -AND C.${by} LIKE CONCAT('%', #{term}, '%') - - - AND C.CRDN_ID = #{crdnId} AND C.TASK_SE_CD = #{taskSeCd} AND C.VHRNO LIKE CONCAT('%', #{vhrno}, '%') @@ -127,7 +116,36 @@ AND C.${by} LIKE CONCAT('%', #{term}, '%') AND SUBSTR(C.MDFCN_DT,1,8) #{schDateTo} - + +AND C.CRDN_STTS_CD = #{crdnSttsCd} + + +AND CA.TOWNG_YN = #{towngYn} + + + + + + + C.CRDN_INPT_SE_CD + C.VHRNO + C.CRDN_YMD + C.CRDN_PLC + + C.ATCH_FILE_CNT + CA.CRDN_SN + CA.PARKNG_PSBLTY_RSLT_CD + C.CRDN_STTS_CD + LE.LEVY_EXCL_RSN_CD + LE.LEVY_EXCL_YMD + LE.ETC_CN + + #{term} + + + + + @@ -341,7 +359,6 @@ SELECT C.CRDN_ID , CONCAT(C.CRDN_YMD,'',C.CRDN_TM) AS CRDN_YMD_TM , C.VHRNO , C.CRDN_STDG_NM - , '' AS APLCNT_CRDN_NM , C.CRDN_STTS_CD , C.FFNLG_AMT , C.ADVNTCE_AMT 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 7850e925..ca4310f8 100644 --- a/src/main/resources/sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml +++ b/src/main/resources/sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml @@ -81,7 +81,6 @@ SELECT C.CRDN_ID , C.CRDN_YMD , C.CRDN_TM , CONCAT(C.CRDN_YMD,'',C.CRDN_TM) AS CRDN_YMD_TM - , '' AS APLCNT_CRDN_NM , C.VHRNO , C.CRDN_STDG_NM , C.CRDN_ROAD_NM diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn03010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn03010-main.jsp index 780cf15b..eb5296cf 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn03010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn03010-main.jsp @@ -71,8 +71,6 @@ style="min-width: 80px;">차량번호 법정동 - 신고/단속자 잔액 사진건수 @@ -89,7 +87,6 @@ {CRDN_YMD_TM} {VHRNO} {CRDN_STDG_NM} - {APLCNT_CRDN_NM} {BLNC} {ATCH_FILE_CNT} {CRDN_SN} diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp index 2dd22a48..682fd18a 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp @@ -74,6 +74,8 @@
+ +
@@ -146,26 +144,39 @@ - + +