From 925bc66c15f770f8d15e3b4962b00236a14b3a37 Mon Sep 17 00:00:00 2001
From: leebeomjun <leebj91@xit.co.kr>
Date: Wed, 8 Nov 2023 11:11:11 +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    | 19 +++++++++---------
 .../WEB-INF/jsp/fims/sprt/sprt01010-main.jsp  | 20 ++++++++++++++-----
 .../WEB-INF/jsp/fims/sprt/sprt01050-info.jsp  | 18 +++++++----------
 .../WEB-INF/jsp/fims/sprt/sprt01060-info.jsp  | 14 +++++--------
 4 files changed, 37 insertions(+), 34 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 c10ab302..7ca71c5c 100644
--- a/src/main/resources/sql/mapper/fims/sprt/integrationSearch-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/sprt/integrationSearch-mapper.xml
@@ -27,7 +27,7 @@
          , CC.CVLCPT_LIST_NO                                                                                /* 민원 목록 번호 */
          , EI.CEL_NO_V                                                                                      /* 민원인 휴대폰 번호 */
          , C.VHRNO                                                                                          /* 차량번호 */
-         /* 대체차량번호 */
+         , L.RPM_SZR_VHRNO                                                                                  /* 대체차량번호 */
          , C.ATCH_FILE_CNT                                                                                  /* 첨부 파일 수 */
          , CA.PARKNG_PSBLTY_RSLT_CD                                                                         /* 주차 가능 결과 코드 */
          , (SELECT GET_CODE_NM('FIM034', CA.PARKNG_PSBLTY_RSLT_CD) FROM DUAL)       AS PARKNG_PSBLTY_RSLT_NM/* 주차 가능 결과 명 */
@@ -69,6 +69,7 @@
          , 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 */
@@ -98,6 +99,7 @@
          , L.DUDT_AFTR_AMT                                                                                  /* 납기후일자 */
          , L.EPAYNO                                                                                         /* 전자납부번호 */
          , L.VR_ACTNO                                                                                       /* 가상계좌번호 */
+         , L.SZR_YMD                                                                                        /* 압류 일자 */
          , VI.TXITM_NM                                                                                      /* 세목 명 */
          , (CASE 
             WHEN R.RCVMT_ID IS NULL
@@ -166,15 +168,15 @@ LEFT OUTER JOIN TB_RCVMT         R   ON (L.LEVY_ID = R.LEVY_ID AND R.DEL_YN = 'N
   <foreach collection="ischKeywordSet" item="item">
     <choose>
       <when test="item.name == 'vhrno'">
-       AND (C.VHRNO = #{item.value} OR '테이블.대체차량번호컬럼' = #{item.value})
+       AND (C.VHRNO = #{item.value} OR L.RPM_SZR_VHRNO = #{item.value})
       </when>
       <when test="item.name == 'rpmSzrVhrno'">
         <choose>
           <when test="item.similar != null">
-       AND '테이블.대체차량번호컬럼' LIKE CONCAT ('%' || #{item.value} || '%')
+       AND L.RPM_SZR_VHRNO LIKE CONCAT ('%' || #{item.value} || '%')
           </when>
           <otherwise>
-       AND '테이블.대체차량번호컬럼' = #{item.value}
+       AND L.RPM_SZR_VHRNO = #{item.value}
           </otherwise>
         </choose>
       </when>
@@ -302,7 +304,7 @@ LEFT OUTER JOIN TB_RCVMT         R   ON (L.LEVY_ID = R.LEVY_ID AND R.DEL_YN = 'N
 				<when test="by == 'cvlcptRcptYmd'">CC.CVLCPT_RCPT_YMD</when>
 				<when test="by == 'cvlcptListNo'">CC.CVLCPT_LIST_NO</when>
 				<when test="by == 'vhrno'">C.VHRNO</when>
-				<when test="by == '대체차량'"></when>
+				<when test="by == 'rpmSzrVhrno'">L.RPM_SZR_VHRNO</when>
 				<when test="by == 'atchFileCnt'">C.ATCH_FILE_CNT</when>
 				<when test="by == 'parkngPsbltyRsltCd'">CA.PARKNG_PSBLTY_RSLT_CD</when>
 				<when test="by == 'rtpyrNm'">P.RTPYR_NM</when>
@@ -318,19 +320,18 @@ LEFT OUTER JOIN TB_RCVMT         R   ON (L.LEVY_ID = R.LEVY_ID AND R.DEL_YN = 'N
 				<when test="by == 'opnnSbmsnYn'">IFNULL(C.OPNN_SBMSN_YN,'N')</when>
 				<when test="by == 'advntceDudtYmd'">C.ADVNTCE_DUDT_YMD</when>
 				<when test="by == 'towngYn'">IFNULL(CA.TOWNG_YN,'N')</when>
-				<when test="by == '압류Ymd'">SOME.압류_YMD</when>
+				<when test="by == 'szrYmd'">L.SZR_YMD</when>
 				<when test="by == '잔액'"></when>
 				<when test="by == 'levyPcptax'">L.LEVY_PCPTAX</when>
 				<when test="by == 'levyAdamt'">L.LEVY_ADAMT</when>
-				<when test="by == '중가산금'"></when>
 				<when test="by == 'dudtYmd'">L.DUDT_YMD</when>
 				<when test="by == 'dudtAftrYmd'">L.DUDT_AFTR_YMD</when>
 				<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 == '재부과Yn'"></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 == '거주상태'"></when>
+				<when test="by == 'rtpyrSttsCd'">P.RTPYR_STTS_CD</when>
 				<when test="by == '이전고지정보'"></when>
 				<when test="by == '과세키'"></when>
 			</choose>
diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01010-main.jsp
index e1245824..62c7d4c7 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01010-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01010-main.jsp
@@ -57,13 +57,23 @@ var integrationSearchControl = new IntegrationSearchControl({
 		load : wctx.url("/sprt/sprt01/010/list.do")			// 검색
 	}
 	, formats : {
-    	  LEVY_EXCL_YMD : dateFormat
-    	, CRDN_YMD_TM : datetimeFormat
-    	, CVLCPT_RCPT_YMD : dateFormat
-    	, FFNLG_CRDN_AMT : numberFormat
-    	, FFNLG_AMT : numberFormat
+		  CRDN_YMD_TM : datetimeFormat
+		, CRDN_STTS_CHG_YMD : dateFormat
+		, CVLCPT_RCPT_YMD : dateFormat
+    	, LEVY_EXCL_YMD : dateFormat
+    	, ADVNTCE_DUDT_YMD : dateFormat
+		, DUDT_YMD : dateFormat
+		, DUDT_AFTR_YMD : dateFormat
     	, REG_DT : datetimeFormat
     	, MDFCN_DT : datetimeFormat
+    	
+    	, FFNLG_CRDN_AMT : numberFormat
+    	, FFNLG_AMT : numberFormat
+    	, MINUS_AMT : numberFormat
+    	, ADTN_AMT : numberFormat
+    	, ADVNTCE_AMT : numberFormat
+    	, RCVMT_AMT : numberFormat
+    	, DUDT_AFTR_AMT : numberFormat
 	}
 });
 
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 525076bb..a6f4a4dd 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
@@ -46,7 +46,7 @@
 	>단속차량번호
 	</th>
 	<th class="cmn" style="width: 160px;" 
-	onclick="searchFromGridTitle('', this.innerText, 'match', 'perfect');"
+	onclick="searchFromGridTitle('RPM_SZR_VHRNO', this.innerText, 'match', 'perfect');"
 	>대체차량번호
 	</th>
 	<th class="cmn" style="width: 120px;" 
@@ -77,7 +77,7 @@
 	onclick="searchFromGridTitle('LEVY_EXCL_YMD', this.innerText, 'ymd', '');"
 	>제외일자
 	</th>
-	<th class="cmn" style="width: 120px;" 
+	<th class="cmn" style="width: 200px;" 
 	onclick="searchFromGridTitle('ETC_CN', this.innerText, 'match', 'part');"
 	>기타사항
 	</th>
@@ -110,11 +110,11 @@
 	>견인여부
 	</th>
 	<th class="cmn" style="width: 120px;" 
-	onclick="searchFromGridTitle('압류_YMD', this.innerText, 'ymd', '');"
+	onclick="searchFromGridTitle('SZR_YMD', this.innerText, 'ymd', '');"
 	>압류일자
 	</th>
 	<th class="cmn" style="width: 120px;" 
-	onclick="searchFromGridTitle('', this.innerText, 'match', 'perfect');"
+	onclick="searchFromGridTitle('', this.innerText, '', '');"
 	>잔액
 	</th>
 	<th class="cmn" style="width: 120px;" 
@@ -126,10 +126,6 @@
 	>가산금
 	</th>
 	<th class="cmn" style="width: 120px;" 
-	onclick="searchFromGridTitle('', this.innerText, 'match', 'perfect');"
-	>중가산금
-	</th>
-	<th class="cmn" style="width: 120px;" 
 	onclick="searchFromGridTitle('DUDT_YMD', this.innerText, 'ymd', '');"
 	>납부기한
 	</th>
@@ -150,15 +146,15 @@
 	>전자납부번호
 	</th>
 	<th class="cmn" style="width: 120px;" 
-	onclick="searchFromGridTitle('', this.innerText, 'match', 'perfect');"
-	>재부과여부
+	onclick="searchFromGridTitle('CRDN_REG_SE_CD', this.innerText, 'codeValue', 'FIM026');"
+	>단속등록구분
 	</th>
 	<th class="cmn" style="width: 300px;" 
 	onclick="searchFromGridTitle('RTPYR_FULL_ADDR', this.innerText, 'match', 'part');"
 	>납부자주소
 	</th>
 	<th class="cmn" style="width: 120px;" 
-	onclick="searchFromGridTitle('', this.innerText, '', '');"
+	onclick="searchFromGridTitle('RTPYR_STTS_CD', this.innerText, 'codeValue', 'FIM014');"
 	>거주상태
 	</th>
 	<th class="cmn" style="width: 120px;" 
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 0ac5463d..b536e9da 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
@@ -47,7 +47,7 @@
 		</td>
 		<td class="cmn text-start"  
 		onclick="{onclick}" ondblclick="{ondblclick}"
-		>{대체차량번호}
+		>{RPM_SZR_VHRNO}
 		</td>
 		<td class="cmn text-center" 
 		onclick="{onclick}" ondblclick="{ondblclick}"
@@ -111,7 +111,7 @@
 		</td>
 		<td class="cmn text-center"  
 		onclick="{onclick}" ondblclick="{ondblclick}"
-		>{압류_YMD}
+		>{SZR_YMD}
 		</td>
 		<td class="cmn text-end"  
 		onclick="{onclick}" ondblclick="{ondblclick}"
@@ -125,10 +125,6 @@
 		onclick="{onclick}" ondblclick="{ondblclick}"
 		>{LEVY_ADAMT}
 		</td>
-		<td class="cmn text-end"  
-		onclick="{onclick}" ondblclick="{ondblclick}"
-		>{중가산금}
-		</td>
 		<td class="cmn text-center" 
 		onclick="{onclick}" ondblclick="{ondblclick}"
 		>{DUDT_YMD}
@@ -151,7 +147,7 @@
 		</td>
 		<td class="cmn text-center" 
 		onclick="{onclick}" ondblclick="{ondblclick}"
-		>{재부과_YN_NM}
+		>{CRDN_REG_SE_NM}
 		</td>
 		<td class="cmn text-start" 
 		onclick="{onclick}" ondblclick="{ondblclick}"
@@ -159,7 +155,7 @@
 		</td>
 		<td class="cmn text-center" 
 		onclick="{onclick}" ondblclick="{ondblclick}"
-		>{거주상태}
+		>{RTPYR_STTS_NM}
 		</td>
 		<td class="cmn text-center" 
 		onclick="{onclick}" ondblclick="{ondblclick}"
@@ -175,6 +171,6 @@
 
 <template id="notFound--${pageName}">
 	<tr class="odd">
-		<td valign="top" colspan="42" class="dataTables_empty text-center">정보를 찾지 못했습니다.</td>
+		<td valign="top" colspan="41" class="dataTables_empty text-center">정보를 찾지 못했습니다.</td>
 	</tr>
 </template>
\ No newline at end of file