From 0b4fb0b5f03f9dc859f226a3117df3909e375a1a Mon Sep 17 00:00:00 2001
From: leebeomjun <leebj91@xit.co.kr>
Date: Fri, 27 Oct 2023 14:54:14 +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    | 64 +++++++++++++++----
 .../WEB-INF/jsp/fims/sprt/sprt01050-info.jsp  |  4 +-
 .../WEB-INF/jsp/fims/sprt/sprt01060-info.jsp  |  2 +-
 3 files changed, 53 insertions(+), 17 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 cfa89629..20fc5400 100644
--- a/src/main/resources/sql/mapper/fims/sprt/integrationSearch-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/sprt/integrationSearch-mapper.xml
@@ -42,17 +42,6 @@
          , (SELECT GET_CODE_NM('FIM010', C.CRDN_STTS_CD) FROM DUAL)                 AS CRDN_STTS_NM         /* 단속 상태 명 */
          , C.CRDN_STTS_CHG_DT                                                                               /* 단속 상태 변경 일시 */
          , C.BFR_CRDN_ID                                                                                    /* 이전 단속 ID */
-         , C.DEL_YN                                                                                         /* 삭제 여부 */
-         , C.REG_DT                                                                                         /* 등록 일시 */
-         , C.RGTR                                                                                           /* 등록자 */
-         , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = C.RGTR)                 AS RGTR_NM              /* 등록자 명 */
-         , C.MDFCN_DT                                                                                       /* 수정 일시 */
-         , C.MDFR                                                                                           /* 수정자 */
-         , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = C.MDFR)                 AS MDFR_NM              /* 수정자 명 */
-         , C.DEL_DT                                                                                         /* 삭제 일시 */
-         , C.DLTR                                                                                           /* 삭제자 */
-         , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = C.DLTR)                 AS DLTR_NM              /* 삭제자 명 */
-         , C.DEL_RSN                                                                                        /* 삭제 사유 */
          , CA.CRDN_SE_CD                                                                                    /* 단속 구분 코드 */
          , (SELECT GET_CODE_NM('FIM002', CA.CRDN_SE_CD) FROM DUAL)                  AS CRDN_SE_NM           /* 단속 구분 명 */
          , CA.TEAM_ID                                                                                       /* 조 ID */
@@ -134,6 +123,17 @@
             THEN 'Y'
             ELSE 'N'
             END) AS RCVMT_YN
+         , C.DEL_YN                                                                                         /* 삭제 여부 */
+         , C.REG_DT                                                                                         /* 등록 일시 */
+         , C.RGTR                                                                                           /* 등록자 */
+         , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = C.RGTR)                 AS RGTR_NM              /* 등록자 명 */
+         , C.MDFCN_DT                                                                                       /* 수정 일시 */
+         , C.MDFR                                                                                           /* 수정자 */
+         , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = C.MDFR)                 AS MDFR_NM              /* 수정자 명 */
+         , C.DEL_DT                                                                                         /* 삭제 일시 */
+         , C.DLTR                                                                                           /* 삭제자 */
+         , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = C.DLTR)                 AS DLTR_NM              /* 삭제자 명 */
+         , C.DEL_RSN                                                                                        /* 삭제 사유 */
       FROM TB_CRDN               C                                                                           /* 단속 대장 */
      INNER JOIN TB_CRDN_ADI      CA  ON (C.CRDN_ID  = CA.CRDN_ID)                                            /* 단속 부가 정보 */
      INNER JOIN TB_VLTN_INFO     VI  ON (C.VLTN_ID  = VI.VLTN_ID)                                            /* 위반 정보 */
@@ -279,17 +279,53 @@ LEFT OUTER JOIN TB_RCVMT         R   ON (L.LEVY_ID = R.LEVY_ID AND R.DEL_YN = 'N
 		<when test="mainOption == 'codeValue' or mainOption == 'match' or mainOption == 'ymd'">
 			<include refid="dynamicSearch.start" />
 			<choose>
+				<when test="by == 'taskSeCd'">C.TASE_SE_CD</when>
 				<when test="by == 'crdnInptSeCd'">C.CRDN_INPT_SE_CD</when>
 				<when test="by == 'crdnYmd'">C.CRDN_YMD</when>
+				<when test="by == 'cvlcptAplcntNm'">CC.CVLCPT_APLCNT_NM</when>
+				<when test="by == 'cvlcptRcptNo'">CC.CVLCPT_RCPT_NO</when>
+				<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 == 'crdnStdgNm'">C.CRDN_STDG_NM</when>
+				<when test="by == '대체차량'"></when>
 				<when test="by == 'atchFileCnt'">C.ATCH_FILE_CNT</when>
-				<when test="by == 'crdnSn'">CA.CRDN_SN</when>
+				<when test="by == 'parkngPsbltyRsltCd'">CA.PARKNG_PSBLTY_RSLT_CD</when>
+				<when test="by == 'rtpyrNm'">P.RTPYR_NM</when>
+				<when test="by == 'rtPyrNo'">P.RTPYR_NO</when>
+				<when test="by == 'crdnSttsCd'">C.CRDN_STTS_CD</when>
+				<when test="by == 'levyExclRsnCd'">LE.LEVY_EXCL_RSN_CD</when>
+				<when test="by == 'levyExclYmd'">LE.LEVY_EXCL_YMD</when>
+				<when test="by == 'etcCn'">C.ETC_CN</when>
+				<when test="by == 'gojiNo'">CONCAT(L.FYR, '-', L.LEVY_NO)</when>
+				<when test="by == '처리일자'"></when>
+				<when test="by == 'crdnPlc'">C.CRDN_PLC</when>
+				<when test="by == 'crdnSeCd'">C.CRDN_SE_CD</when>
+				<when test="by == '의견진술여부'"></when>
+				<when test="by == '의견진술기한'"></when>
+				<when test="by == 'towngYn'">CA.TOWNG_YN</when>
+				<when test="by == '이의신청여부'"></when>
+				<when test="by == '압류예정일자'"></when>
+				<when test="by == '압류일자'"></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 == '재부과여부'"></when>
+				<when test="by == 'rtpyrFullAddr'">CONCAT(P.ADDR,' ',P.DTL_ADDR)</when>
+				<when test="by == '거주상태'"></when>
+				<when test="by == '이전고지정보'"></when>
+				<when test="by == '과세키'"></when>
+				<when test="by == '이전시군구'"></when>
 			</choose>
 			<include refid="dynamicSearch.center" />#{term}<include refid="dynamicSearch.end" />
 		</when>
 		<otherwise>
-		
+		    <if test="by == 'sggCd'"> AND (SELECT COUNT(*) FROM TB_SGG_INFO WHERE SGG_NM = #{term}) = 1 </if>
 		</otherwise>
 	</choose>
 </if>
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 b309e4c0..0b6042b6 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
@@ -43,7 +43,7 @@
 	</th>
 	<th class="cmn" style="width: 160px;" 
 	onclick="searchFromGridTitle('VHRNO', this.innerText, 'match', 'perfect');"
-	>차량번호
+	>단속차량번호
 	</th>
 	<th class="cmn" style="width: 160px;" 
 	onclick="searchFromGridTitle('', this.innerText, 'match', 'perfect');"
@@ -162,7 +162,7 @@
 	>재부과여부
 	</th>
 	<th class="cmn" style="width: 300px;" 
-	onclick="searchFromGridTitle('RTPYR_ADDR', this.innerText, 'match', 'part');"
+	onclick="searchFromGridTitle('RTPYR_FULL_ADDR', this.innerText, 'match', 'part');"
 	>납부자주소
 	</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 ef4d1308..ffe0b8d8 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
@@ -163,7 +163,7 @@
 		</td>
 		<td class="cmn text-start" 
 		onclick="{onclick}" ondblclick="{ondblclick}"
-		>{RTPYR_ADDR}
+		>{RTPYR_FULL_ADDR}
 		</td>
 		<td class="cmn text-center" 
 		onclick="{onclick}" ondblclick="{ondblclick}"