From b5f943eeb90a4397d96292613b43b0bd5528f933 Mon Sep 17 00:00:00 2001
From: leebeomjun <leebj91@xit.co.kr>
Date: Wed, 8 Nov 2023 13:35:18 +0900
Subject: [PATCH] =?UTF-8?q?=ED=86=B5=ED=95=A9=EC=A1=B0=ED=9A=8C=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fims/sprt/integrationSearch-mapper.xml    | 16 +++++++---
 .../WEB-INF/jsp/fims/sprt/sprt01050-info.jsp  | 32 +++++++++++++++++--
 .../WEB-INF/jsp/fims/sprt/sprt01060-info.jsp  | 30 ++++++++++++++++-
 3 files changed, 71 insertions(+), 7 deletions(-)

diff --git a/src/main/resources/sql/mapper/fims/sprt/integrationSearch-mapper.xml b/src/main/resources/sql/mapper/fims/sprt/integrationSearch-mapper.xml
index 7ca71c5c..165cd821 100644
--- a/src/main/resources/sql/mapper/fims/sprt/integrationSearch-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/sprt/integrationSearch-mapper.xml
@@ -69,7 +69,6 @@
          , C.ADVNTCE_BGNG_YMD                                                                               /* 사전통지 시작 일자 */
          , C.ADVNTCE_DUDT_YMD                                                                               /* 사전통지 납기 일자 */
          , C.ADVNTCE_AMT                                                                                    /* 사전통지 금액 */
-         
          , IFNULL(C.OPNN_SBMSN_YN,'N')                                              AS OPNN_SBMSN_YN        /* 의견 제출 여부 */
          , (SELECT GET_CODE_NM('CMM006', IFNULL(C.OPNN_SBMSN_YN,'N')) FROM DUAL)    AS OPNN_SBMSN_YN_NM     /* 의견 제출 여부 명 */
          , L.LEVY_ID                                                                                        /* 부과 ID */
@@ -86,13 +85,14 @@
          , L.LEVY_PCPTAX                                                                                    /* 부과 본세 */
          , L.LEVY_ADAMT                                                                                     /* 부과 가산금 */
          , L.INSPY_INT                                                                                      /* 분납 이자 */
-         , L.LEVY_PCPTAX + L.LEVY_ADAMT + L.INSPY_INT                               AS LEVY_AMT             /* 부과금액 */
+         , (L.LEVY_PCPTAX + L.LEVY_ADAMT + L.INSPY_INT)                             AS LEVY_AMT             /* 부과금액 */
+         , L.RCVMT_YMD                                                                                      /* 수납 일자 */
          , L.RCVMT_PCPTAX                                                                                   /* 수납 본세 */
          , L.RCVMT_ADAMT                                                                                    /* 수납 가산금 */
-         , L.RCVMT_PCPTAX + L.RCVMT_ADAMT                                           AS RCVMT_AMT            /* 수납 금액 */
+         , (L.RCVMT_PCPTAX + L.RCVMT_ADAMT)                                         AS RCVMT_AMT            /* 수납 금액 */
          , L.RDCAMT_PCPTAX                                                                                  /* 감액 본세 */
          , L.RDCAMT_ADAMT                                                                                   /* 감액 가산금 */
-         , L.RDCAMT_PCPTAX + L.RDCAMT_ADAMT                                         AS REDUC_AMT            /* 감액 금액 */
+         , (L.RDCAMT_PCPTAX + L.RDCAMT_ADAMT)                                       AS REDUC_AMT            /* 감액 금액 */
          , L.SUM_AMT                                                                                        /* 합계 금액 */
          , L.DUDT_YMD                                                                                       /* 납부기한 */
          , L.DUDT_AFTR_YMD                                                                                  /* 납기후금액 */
@@ -100,6 +100,7 @@
          , L.EPAYNO                                                                                         /* 전자납부번호 */
          , L.VR_ACTNO                                                                                       /* 가상계좌번호 */
          , L.SZR_YMD                                                                                        /* 압류 일자 */
+         , L.SZR_RMV_YMD                                                                                    /* 압류 해제 일자 */
          , VI.TXITM_NM                                                                                      /* 세목 명 */
          , (CASE 
             WHEN R.RCVMT_ID IS NULL
@@ -321,7 +322,9 @@ LEFT OUTER JOIN TB_RCVMT         R   ON (L.LEVY_ID = R.LEVY_ID AND R.DEL_YN = 'N
 				<when test="by == 'advntceDudtYmd'">C.ADVNTCE_DUDT_YMD</when>
 				<when test="by == 'towngYn'">IFNULL(CA.TOWNG_YN,'N')</when>
 				<when test="by == 'szrYmd'">L.SZR_YMD</when>
+				<when test="by == 'szrRmvYmd'">L.SZR_RMV_YMD</when>
 				<when test="by == '잔액'"></when>
+				<when test="by == 'levyAmt'">(L.LEVY_PCPTAX+L.LEVY_ADAMT+L.INSPY_INT)</when>
 				<when test="by == 'levyPcptax'">L.LEVY_PCPTAX</when>
 				<when test="by == 'levyAdamt'">L.LEVY_ADAMT</when>
 				<when test="by == 'dudtYmd'">L.DUDT_YMD</when>
@@ -329,6 +332,11 @@ LEFT OUTER JOIN TB_RCVMT         R   ON (L.LEVY_ID = R.LEVY_ID AND R.DEL_YN = 'N
 				<when test="by == 'dudtAftrAmt'">L.DUDT_AFTR_AMT</when>
 				<when test="by == 'vrActno'">L.VR_ACTNO</when>
 				<when test="by == 'epayno'">L.EPAYNO</when>
+				<when test="by == 'payMthdSeCd'"></when>
+				<when test="by == 'rcvmtYmd'">L.RCVMT_YMD</when>
+				<when test="by == 'rcvmtAmt'">(L.RCVMT_PCPTAX+L.RCVMT_ADAMT)</when>
+				<when test="by == 'rcvmtPcptax'">L.RCVMT_PCPTAX</when>
+				<when test="by == 'rcvmtAdamt'">L.RCVMT_ADAMT</when>
 				<when test="by == 'crdnRegSeCd'">C.CRDN_REG_SE_CD</when>
 				<when test="by == 'rtpyrFullAddr'">CONCAT(P.ADDR,' ',P.DTL_ADDR)</when>
 				<when test="by == 'rtpyrSttsCd'">P.RTPYR_STTS_CD</when>
diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01050-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01050-info.jsp
index a6f4a4dd..fe656a1b 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01050-info.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01050-info.jsp
@@ -21,7 +21,7 @@
 	onclick="searchFromGridTitle('CRDN_INPT_SE_CD', this.innerText, 'codeValue', 'FIM003');"
 	>단속입력구분
 	</th>
-	<th class="cmn" style="width: 180px;" 
+	<th class="cmn" style="width: 180px;"
 	onclick="searchFromGridTitle('CRDN_YMD', this.innerText, 'ymd', '');"
 	>단속일시
 	</th>
@@ -114,10 +114,18 @@
 	>압류일자
 	</th>
 	<th class="cmn" style="width: 120px;" 
+	onclick="searchFromGridTitle('SZR_RMV_YMD', this.innerText, 'ymd', '');"
+	>압류해제일자
+	</th>
+	<th class="cmn" style="width: 120px;" 
 	onclick="searchFromGridTitle('', this.innerText, '', '');"
 	>잔액
 	</th>
 	<th class="cmn" style="width: 120px;" 
+	onclick="searchFromGridTitle('LEVY_AMT', this.innerText, 'match', 'perfect');"
+	>부과금액
+	</th>
+	<th class="cmn" style="width: 120px;" 
 	onclick="searchFromGridTitle('LEVY_PCPTAX', this.innerText, 'match', 'perfect');"
 	>본세
 	</th>
@@ -146,10 +154,30 @@
 	>전자납부번호
 	</th>
 	<th class="cmn" style="width: 120px;" 
+	onclick="searchFromGridTitle('PAY_MTHD_SE_CD', this.innerText, 'codeValue', 'FIM045');"
+	>수납유형
+	</th>
+	<th class="cmn" style="width: 120px;" 
+	onclick="searchFromGridTitle('RCVMT_YMD', this.innerText, 'ymd', '');"
+	>수납일자
+	</th>
+	<th class="cmn" style="width: 120px;" 
+	onclick="searchFromGridTitle('RCVMT_AMT', this.innerText, 'match', 'perfect');"
+	>수납금액
+	</th>
+	<th class="cmn" style="width: 120px;" 
+	onclick="searchFromGridTitle('RCVMT_PCPTAX', this.innerText, 'match', 'perfect');"
+	>수납본세
+	</th>
+	<th class="cmn" style="width: 120px;" 
+	onclick="searchFromGridTitle('RCVMT_ADAMT', this.innerText, 'match', 'perfect');"
+	>수납가산금
+	</th>
+	<th class="cmn" style="width: 120px;" 
 	onclick="searchFromGridTitle('CRDN_REG_SE_CD', this.innerText, 'codeValue', 'FIM026');"
 	>단속등록구분
 	</th>
-	<th class="cmn" style="width: 300px;" 
+	<th class="cmn" style="width: 550px;" 
 	onclick="searchFromGridTitle('RTPYR_FULL_ADDR', this.innerText, 'match', 'part');"
 	>납부자주소
 	</th>
diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01060-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01060-info.jsp
index b536e9da..52221879 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01060-info.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01060-info.jsp
@@ -113,12 +113,20 @@
 		onclick="{onclick}" ondblclick="{ondblclick}"
 		>{SZR_YMD}
 		</td>
+		<td class="cmn text-center"  
+		onclick="{onclick}" ondblclick="{ondblclick}"
+		>{SZR_RMV_YMD}
+		</td>
 		<td class="cmn text-end"  
 		onclick="{onclick}" ondblclick="{ondblclick}"
 		>{잔액}
 		</td>
 		<td class="cmn text-end"	
 		onclick="{onclick}" ondblclick="{ondblclick}"
+		>{LEVY_AMT}
+		</td>
+		<td class="cmn text-end"	
+		onclick="{onclick}" ondblclick="{ondblclick}"
 		>{LEVY_PCPTAX}
 		</td>
 		<td class="cmn text-end" 
@@ -147,6 +155,26 @@
 		</td>
 		<td class="cmn text-center" 
 		onclick="{onclick}" ondblclick="{ondblclick}"
+		>{PAY_MTHD_SE_CD}
+		</td>
+		<td class="cmn text-center" 
+		onclick="{onclick}" ondblclick="{ondblclick}"
+		>{RCVMT_YMD}
+		</td>
+		<td class="cmn text-center" 
+		onclick="{onclick}" ondblclick="{ondblclick}"
+		>{RCVMT_AMT}
+		</td>
+		<td class="cmn text-center" 
+		onclick="{onclick}" ondblclick="{ondblclick}"
+		>{RCVMT_PCPTAX}
+		</td>
+		<td class="cmn text-center" 
+		onclick="{onclick}" ondblclick="{ondblclick}"
+		>{RCVMT_ADAMT}
+		</td>
+		<td class="cmn text-center" 
+		onclick="{onclick}" ondblclick="{ondblclick}"
 		>{CRDN_REG_SE_NM}
 		</td>
 		<td class="cmn text-start" 
@@ -171,6 +199,6 @@
 
 <template id="notFound--${pageName}">
 	<tr class="odd">
-		<td valign="top" colspan="41" class="dataTables_empty text-center">정보를 찾지 못했습니다.</td>
+		<td valign="top" colspan="48" class="dataTables_empty text-center">정보를 찾지 못했습니다.</td>
 	</tr>
 </template>
\ No newline at end of file