diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn02Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn02Controller.java index 65e4d154..ec641baa 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn02Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn02Controller.java @@ -140,7 +140,7 @@ public class Crdn02Controller extends ApplicationController { case "위반동": return xlsx.style("CRDN_STDG_NM", XLSWriter.Styler.CENTER); case "단속동": return xlsx.style("CRDN_STDG_NM", XLSWriter.Styler.CENTER); case "원금액": return xlsx.style("FFNLG_CRDN_AMT", numeric); - case "감경금액": return ""; + case "감경금액": return xlsx.style("ADVNTCE_AMT", numeric); case "금액": return xlsx.style("FFNLG_CRDN_AMT", numeric); case "단속조": return xlsx.style("TEAM_NM", XLSWriter.Styler.CENTER); case "성명": return "RTPYR_NM"; 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 4caed824..cba9250b 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 @@ -217,7 +217,7 @@ SELECT C.CRDN_ID , C.CRDN_STTS_CD , (SELECT GET_CODE_NM('FIM010', C.CRDN_STTS_CD) FROM DUAL) AS CRDN_STTS_NM , C.FFNLG_CRDN_AMT - + , C.ADVNTCE_AMT , C.CRDN_INPT_SE_CD , (SELECT GET_CODE_NM('FIM003', C.CRDN_INPT_SE_CD) FROM DUAL) AS CRDN_INPT_SE_NM FROM TB_CRDN C @@ -253,6 +253,7 @@ SELECT C.CRDN_ID C.ATCH_FILE_CNT C.CRDN_STTS_CD C.FFNLG_CRDN_AMT + C.ADVNTCE_AMT C.CRDN_INPT_SE_CD #{term} diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02010-main.jsp index 0912a54a..85f8b775 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02010-main.jsp @@ -201,10 +201,10 @@ 사진매수 처리상태 + style="width: 120px;">처리상태 원금액 - 감경금액 자료출처 @@ -226,7 +226,7 @@ {ATCH_FILE_CNT} {CRDN_STTS_CD} {FFNLG_CRDN_AMT} - {unknown} + {ADVNTCE_AMT} {CRDN_INPT_SE_CD} @@ -399,8 +399,8 @@ $(document).ready(function(){ CRDN_YMD_TM : datetimeFormat, CRDN_INPT_SE_CD : FIM003, CRDN_STTS_CD : FIM010, - FFNLG_CRDN_AMT : numberFormat - //감경금액 + FFNLG_CRDN_AMT : numberFormat, + ADVNTCE_AMT : numberFormat } }); $P.photoInspectionControl.defaultFetchSize = FETCH_XS; @@ -423,7 +423,8 @@ $(document).ready(function(){ formats: { CRDN_YMD_TM : datetimeFormat, CRDN_INPT_SE_CD : FIM003, - CRDN_STTS_CD : FIM010 + CRDN_STTS_CD : FIM010, + FFNLG_CRDN_AMT : numberFormat } } );