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 674d87e0..e12ca148 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java @@ -79,9 +79,9 @@ public class Crdn06Controller extends ApplicationController { mav.setViewName("fims/crdn/crdn06040-main"); mav.addObject("pageName","crdn06040-main"); - Map> commonCodes = getCodesOf("FIM010", "FIM054"); + Map> commonCodes = getCodesOf("FIM010", "FIM019", "FIM054"); mav.addObject("FIM054List", commonCodes.get("FIM054")); - addCodes(commonCodes, mav, "FIM010"); + addCodes(commonCodes, mav, "FIM010", "FIM019"); return mav; } diff --git a/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml b/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml index f9e100f7..16643435 100644 --- a/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml +++ b/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml @@ -373,26 +373,17 @@ SELECT C.CRDN_ID AND C.CRDN_STTS_CD = '21' - -AND FN_GET_CODE_NM('FIM003', C.CRDN_INPT_SE_CD) LIKE CONCAT('%', #{term}, '%') - - -AND C.CRDN_YMD = REPLACE(#{term},'-','') - - -AND C.VHRNO LIKE CONCAT('%', #{term}, '%') - - -AND C.CRDN_STDG_NM LIKE CONCAT('%', #{term}, '%') - - - - - -AND C.ATCH_FILE_CNT = #{term} - - -AND C.CRDN_SN = #{term} + + + + C.CRDN_INPT_SE_CD + C.CRDN_YMD + C.VHRNO + C.CRDN_STDG_NM + C.ATCH_FILE_CNT + C.CRDN_SN + + #{term} @@ -439,26 +430,18 @@ SELECT C.CRDN_ID AND C.TASK_SE_CD = #{taskSeCd} - -AND SUBSTR(RD.REG_DT,1,8) = REPLACE(#{term},'-','') - - -AND FN_GET_CODE_NM('FIM019', RD.RDUCT_RSN_CD) LIKE CONCAT('%', #{term}, '%') - - -AND C.CRDN_YMD = REPLACE(#{term},'-','') - - -AND C.VHRNO = REPLACE(#{term},'-','') - - -AND RD.RDUCT_AMT = REPLACE(#{term},',','') - - -AND RD.ETC_CN LIKE CONCAT('%', #{term}, '%') - - -AND FN_GET_CODE_NM('FIM010', C.CRDN_STTS_CD) LIKE CONCAT('%', #{term}, '%') + + + + RD.REG_DT + RD.RDUCT_RSN_CD + C.CRDN_YMD + C.VHRNO + RD.RDUCT_AMT + RD.ETC_CN + C.CRDN_STTS_CD + + #{term} diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06030-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06030-main.jsp index 17e1906e..f8e545a2 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06030-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06030-main.jsp @@ -63,14 +63,14 @@ data-by="by--${pageName}" data-by-output="byOutput--${pageName}" data-main-option="mainOption--${pageName}" data-sub-option="subOption--${pageName}"> No. - 자료출처 - 위반일시 - 차량번호 - 법정동 - 신고/단속자 + 자료출처 + 위반일시 + 차량번호 + 법정동 + 신고/단속자 잔액 - 사진건수 - 발행번호 + 사진건수 + 발행번호 diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06040-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06040-main.jsp index 33b92a1a..6586c271 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06040-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06040-main.jsp @@ -76,14 +76,14 @@ data-by="by--${pageName}" data-by-output="byOutput--${pageName}" data-main-option="mainOption--${pageName}" data-sub-option="subOption--${pageName}"> No. - 감액일자 - 감액사유 - 접수(위반)일시 - 차량번호 - 감액금액 + 감액일자 + 감액사유 + 접수(위반)일시 + 차량번호 + 감액금액 잔액 - 감액특기사항 - 처리상태 + 감액특기사항 + 처리상태 @@ -127,7 +127,7 @@ * Global Variable **************************************************************************/ var FIM010 = new CommonCodes(${FIM010}); - +var FIM019 = new CommonCodes(${FIM019}); pageObject["${pageName}"] = {}; @@ -142,6 +142,7 @@ $(document).ready(function(){ $P.crdnControl = new DatasetControl({ prefix:"crdn", prefixName:"종합", infoSize:"xl", urls : { load : "", getInfo : "" }, formats: { + RDUCT_RSN_CD : FIM019, RDUCT_YMD : dateFormat, CRDN_YMD_TM : datetimeFormat, RDUCT_AMT : numberFormat,