From b793ea0199202d8097d6c0348916957e6b7573cd Mon Sep 17 00:00:00 2001
From: leebeomjun <leebj91@xit.co.kr>
Date: Tue, 18 Jul 2023 15:59:22 +0900
Subject: [PATCH] =?UTF-8?q?=EB=8F=99=EC=A0=81=20=EA=B2=80=EC=83=89=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95(=ED=91=9C=EC=A7=80=EC=A0=95=EB=B3=B4?=
 =?UTF-8?q?=EB=AF=B8=ED=99=95=EC=9D=B8=EC=9E=90=EB=A3=8C,=EA=B3=BC?=
 =?UTF-8?q?=ED=83=9C=EB=A3=8C=EA=B0=90=EA=B2=BD=EC=9E=90=EB=A3=8C)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xit/fims/crdn/web/Crdn06Controller.java   |  4 +-
 .../sql/mapper/fims/crdn/crdn06-mapper.xml    | 63 +++++++------------
 .../WEB-INF/jsp/fims/crdn/crdn06030-main.jsp  | 14 ++---
 .../WEB-INF/jsp/fims/crdn/crdn06040-main.jsp  | 17 ++---
 4 files changed, 41 insertions(+), 57 deletions(-)

diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java
index 674d87e0..e12ca148 100644
--- a/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java
+++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java
@@ -79,9 +79,9 @@ public class Crdn06Controller extends ApplicationController {
 		mav.setViewName("fims/crdn/crdn06040-main");
 		mav.addObject("pageName","crdn06040-main");
 
-		Map<String, List<CommonCode>> commonCodes = getCodesOf("FIM010", "FIM054");
+		Map<String, List<CommonCode>> commonCodes = getCodesOf("FIM010", "FIM019", "FIM054");
 		mav.addObject("FIM054List", commonCodes.get("FIM054"));
-		addCodes(commonCodes, mav, "FIM010");
+		addCodes(commonCodes, mav, "FIM010", "FIM019");
 		return mav;
 	}
 
diff --git a/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml b/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml
index f9e100f7..16643435 100644
--- a/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml
@@ -373,26 +373,17 @@ SELECT C.CRDN_ID                                      <!-- 단속 ID -->
    AND C.CRDN_STTS_CD = '21'
 <if test="by != null and by != '' and term != null">
 	<choose>
-		<when test="by == 'crdnInptSeCd'">
-AND FN_GET_CODE_NM('FIM003', C.CRDN_INPT_SE_CD) LIKE CONCAT('%', #{term}, '%')
-		</when>
-		<when test="by == 'crdnYmd'">
-AND C.CRDN_YMD = REPLACE(#{term},'-','')
-		</when>
-		<when test="by == 'vhrno'">
-AND C.VHRNO LIKE CONCAT('%', #{term}, '%')
-		</when>
-		<when test="by == 'crdnStdgNm'">
-AND C.CRDN_STDG_NM LIKE CONCAT('%', #{term}, '%')
-		</when>
-		<when test="by == 'aplcntCrdnNm'">
-
-		</when>
-		<when test="by == 'atchFileCnt'">
-AND C.ATCH_FILE_CNT = #{term}
-		</when>
-		<when test="by == 'crdnSn'">
-AND C.CRDN_SN = #{term}
+		<when test="mainOption == 'codeValue' or mainOption == 'match' or mainOption == 'ymd'">
+			<include refid="dynamicSearch.start" />
+			<choose>
+				<when test="by == 'crdnInptSeCd'">C.CRDN_INPT_SE_CD</when>
+				<when test="by == 'crdnYmd'">C.CRDN_YMD</when>
+				<when test="by == 'vhrno'">C.VHRNO</when>
+				<when test="by == 'crdnStdgNm'">C.CRDN_STDG_NM</when>
+				<when test="by == 'atchFileCnt'">C.ATCH_FILE_CNT</when>
+				<when test="by == 'crdnSn'">C.CRDN_SN</when>
+			</choose>
+			<include refid="dynamicSearch.center" />#{term}<include refid="dynamicSearch.end" />
 		</when>
 		<otherwise>
 		</otherwise>
@@ -439,26 +430,18 @@ SELECT C.CRDN_ID                                      <!-- 단속 ID -->
    AND C.TASK_SE_CD = #{taskSeCd}
 <if test="by != null and by != '' and term != null">
 	<choose>
-		<when test="by == 'rductYmd'">
-AND SUBSTR(RD.REG_DT,1,8) = REPLACE(#{term},'-','')
-		</when>
-		<when test="by == 'rductRsnCd'">
-AND FN_GET_CODE_NM('FIM019', RD.RDUCT_RSN_CD) LIKE CONCAT('%', #{term}, '%')
-		</when>
-		<when test="by == 'crdnYmd'">
-AND C.CRDN_YMD = REPLACE(#{term},'-','')
-		</when>
-		<when test="by == 'vhrno'">
-AND C.VHRNO = REPLACE(#{term},'-','')
-		</when>
-		<when test="by == 'rductAmt'">
-AND RD.RDUCT_AMT = REPLACE(#{term},',','')
-		</when>
-		<when test="by == 'rductEtcCn'">
-AND RD.ETC_CN LIKE CONCAT('%', #{term}, '%')
-		</when>
-		<when test="by == 'crdnSttsCd'">
-AND FN_GET_CODE_NM('FIM010', C.CRDN_STTS_CD) LIKE CONCAT('%', #{term}, '%')
+		<when test="mainOption == 'codeValue' or mainOption == 'match' or mainOption == 'ymd'">
+			<include refid="dynamicSearch.start" />
+			<choose>
+				<when test="by == 'rductYmd'">RD.REG_DT</when>
+				<when test="by == 'rductRsnCd'">RD.RDUCT_RSN_CD</when>
+				<when test="by == 'crdnYmd'">C.CRDN_YMD</when>
+				<when test="by == 'vhrno'">C.VHRNO</when>
+				<when test="by == 'rductAmt'">RD.RDUCT_AMT</when>
+				<when test="by == 'rductEtcCn'">RD.ETC_CN</when>
+				<when test="by == 'crdnSttsCd'">C.CRDN_STTS_CD</when>
+			</choose>
+			<include refid="dynamicSearch.center" />#{term}<include refid="dynamicSearch.end" />
 		</when>
 		<otherwise>
 		</otherwise>
diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06030-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06030-main.jsp
index 17e1906e..f8e545a2 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06030-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06030-main.jsp
@@ -63,14 +63,14 @@
 											data-by="by--${pageName}" data-by-output="byOutput--${pageName}"
 											data-main-option="mainOption--${pageName}" data-sub-option="subOption--${pageName}">
 											<th width="80">No.</th>
-											<th width="80" onclick="searchFromGridTitle('CRDN_INPT_SE_CD',this.innerText);">자료출처</th>
-											<th width="80" onclick="searchFromGridTitle('CRDN_YMD','위반일자');">위반일시</th>
-											<th width="80" onclick="searchFromGridTitle('VHRNO',this.innerText);">차량번호</th>
-											<th width="80" onclick="searchFromGridTitle('CRDN_STDG_NM',this.innerText);">법정동</th>
-											<th width="80" onclick="searchFromGridTitle('APLCNT_CRDN_NM',this.innerText);">신고/단속자</th>
+											<th width="80" onclick="searchFromGridTitle('CRDN_INPT_SE_CD',this.innerText,'codeValue','FIM003');">자료출처</th>
+											<th width="80" onclick="searchFromGridTitle('CRDN_YMD','위반일자','ymd','');">위반일시</th>
+											<th width="80" onclick="searchFromGridTitle('VHRNO',this.innerText,'match','part');">차량번호</th>
+											<th width="80" onclick="searchFromGridTitle('CRDN_STDG_NM',this.innerText,'match','perfect');">법정동</th>
+											<th width="80" onclick="searchFromGridTitle('APLCNT_CRDN_NM',this.innerText,'','');">신고/단속자</th>
 											<th width="80" class="text-orange">잔액</th>
-											<th width="80" onclick="searchFromGridTitle('ATCH_FILE_CNT',this.innerText);">사진건수</th>
-											<th width="80" onclick="searchFromGridTitle('CRDN_SN',this.innerText);">발행번호</th>
+											<th width="80" onclick="searchFromGridTitle('ATCH_FILE_CNT',this.innerText,'match','perfect');">사진건수</th>
+											<th width="80" onclick="searchFromGridTitle('CRDN_SN',this.innerText,'match','perfect');">발행번호</th>
 										</tr>
 				                    </thead>
 				                    <tbody id="crdnTbody--${pageName}">
diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06040-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06040-main.jsp
index 33b92a1a..6586c271 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06040-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06040-main.jsp
@@ -76,14 +76,14 @@
 											data-by="by--${pageName}" data-by-output="byOutput--${pageName}"
 											data-main-option="mainOption--${pageName}" data-sub-option="subOption--${pageName}">
 											<th width="80">No.</th>
-											<th width="80" onclick="searchFromGridTitle('RDUCT_YMD',this.innerText);">감액일자</th>
-											<th width="80" onclick="searchFromGridTitle('RDUCT_RSN_CD',this.innerText);">감액사유</th>
-											<th width="80" onclick="searchFromGridTitle('CRDN_YMD','위반일자');">접수(위반)일시</th>
-											<th width="80" onclick="searchFromGridTitle('VHRNO',this.innerText);">차량번호</th>
-											<th width="80" onclick="searchFromGridTitle('RDUCT_AMT',this.innerText);">감액금액</th>
+											<th width="80" onclick="searchFromGridTitle('RDUCT_YMD',this.innerText,'ymd','');">감액일자</th>
+											<th width="80" onclick="searchFromGridTitle('RDUCT_RSN_CD',this.innerText,'codeValue','FIM019');">감액사유</th>
+											<th width="80" onclick="searchFromGridTitle('CRDN_YMD','접수(위반)일자','ymd','');">접수(위반)일시</th>
+											<th width="80" onclick="searchFromGridTitle('VHRNO',this.innerText,'match','part');">차량번호</th>
+											<th width="80" onclick="searchFromGridTitle('RDUCT_AMT',this.innerText,'match','perfect');">감액금액</th>
 											<th width="80" class="text-orange">잔액</th>
-											<th width="80" onclick="searchFromGridTitle('RDUCT_ETC_CN',this.innerText);">감액특기사항</th>
-											<th width="80" onclick="searchFromGridTitle('CRDN_STTS_CD',this.innerText);">처리상태</th>
+											<th width="80" onclick="searchFromGridTitle('RDUCT_ETC_CN',this.innerText,'match','part');">감액특기사항</th>
+											<th width="80" onclick="searchFromGridTitle('CRDN_STTS_CD',this.innerText,'codeValue','FIM010');">처리상태</th>
 										</tr>
 				                    </thead>
 				                    <tbody id="crdnTbody--${pageName}"></tbody>
@@ -127,7 +127,7 @@
  * Global Variable
  **************************************************************************/
 var FIM010 = new CommonCodes(${FIM010});
-
+var FIM019 = new CommonCodes(${FIM019});
 pageObject["${pageName}"] = {};
 
 
@@ -142,6 +142,7 @@ $(document).ready(function(){
 	$P.crdnControl = new DatasetControl({
 	    prefix:"crdn", prefixName:"종합", infoSize:"xl", urls : { load : "", getInfo : "" },
 	    formats: {
+	    	RDUCT_RSN_CD 	: FIM019,
 	    	RDUCT_YMD 		: dateFormat,
 	    	CRDN_YMD_TM 	: datetimeFormat,
 	    	RDUCT_AMT 		: numberFormat,