From 966aa72cd70ea356f1e195a5c4f06c019a4edac9 Mon Sep 17 00:00:00 2001
From: leebeomjun <leebj91@xit.co.kr>
Date: Mon, 18 Dec 2023 08:58:17 +0900
Subject: [PATCH] =?UTF-8?q?=EB=8B=A8=EC=86=8D=EC=9E=90=EB=A3=8C=EA=B2=80?=
 =?UTF-8?q?=EC=82=AC=20=EC=A1=B0=ED=9A=8C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cokr/xit/fims/crdn/web/Crdn02Controller.java    |  2 +-
 .../sql/mapper/fims/crdn/crdn-list-mapper.xml       |  3 ++-
 .../webapp/WEB-INF/jsp/fims/crdn/crdn02010-main.jsp | 13 +++++++------
 3 files changed, 10 insertions(+), 8 deletions(-)

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                                      <!-- 단속 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                                      <!-- 단속 ID -->
 				<when test="by == 'atchFileCnt'">C.ATCH_FILE_CNT</when>
 				<when test="by == 'crdnSttsCd'">C.CRDN_STTS_CD</when>
 				<when test="by == 'ffnlgCrdnAmt'">C.FFNLG_CRDN_AMT</when>
+				<when test="by == 'advntceAmt'">C.ADVNTCE_AMT</when>
 				<when test="by == 'crdnInptSeCd'">C.CRDN_INPT_SE_CD</when>
 			</choose>
 			<include refid="dynamicSearch.center" />#{term}<include refid="dynamicSearch.end" />
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 @@
 									<th onclick="searchFromGridTitle('ATCH_FILE_CNT',this.innerText,'match','perfect');"
 									style="width: 100px;">사진매수</th>
 									<th onclick="searchFromGridTitle('CRDN_STTS_CD',this.innerText,'codeValue','FIM010');"
-									style="width: 100px;">처리상태</th>
+									style="width: 120px;">처리상태</th>
 									<th onclick="searchFromGridTitle('FFNLG_CRDN_AMT',this.innerText,'match','perfect');"
 									style="width: 100px;">원금액</th>
-									<th onclick="searchFromGridTitle('UNKNOWN',this.innerText,'match','perfect');"
+									<th onclick="searchFromGridTitle('ADVNTCE_AMT',this.innerText,'match','perfect');"
 									style="width: 100px;">감경금액</th>
 									<th onclick="searchFromGridTitle('CRDN_INPT_SE_CD',this.innerText,'codeValue','FIM003');"
 									style="width: 120px;">자료출처</th>
@@ -226,7 +226,7 @@
 									<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{ATCH_FILE_CNT}</td>
 									<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{CRDN_STTS_CD}</td>
 									<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-end">{FFNLG_CRDN_AMT}</td>
-									<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-end">{unknown}</td>
+									<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-end">{ADVNTCE_AMT}</td>
 									<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{CRDN_INPT_SE_CD}</td>
 									<td class="dummy-td"></td>
 								</tr>
@@ -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
 		}
 	}
 	);