From d3501ed08761668b94b7d7bdaa5966a6137c6494 Mon Sep 17 00:00:00 2001
From: leebeomjun <leebj91@xit.co.kr>
Date: Mon, 4 Sep 2023 15:58:12 +0900
Subject: [PATCH] =?UTF-8?q?=EB=8B=A8=EC=86=8D=EA=B4=80=EB=A6=AC=ED=99=94?=
 =?UTF-8?q?=EB=A9=B4=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cokr/xit/fims/crdn/CrdnQuery.java    | 10 +++
 .../xit/fims/crdn/web/Crdn06Controller.java   |  5 +-
 .../sql/mapper/fims/crdn/crdn-list-mapper.xml | 43 +++++++---
 .../mapper/fims/cvlc/crdnCvlcpt-mapper.xml    |  1 -
 .../WEB-INF/jsp/fims/crdn/crdn03010-main.jsp  |  3 -
 .../WEB-INF/jsp/fims/crdn/crdn06010-main.jsp  | 80 ++++++++++++-------
 6 files changed, 92 insertions(+), 50 deletions(-)

diff --git a/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java b/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java
index 5364b993..122a5b21 100644
--- a/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java
+++ b/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java
@@ -65,6 +65,7 @@ public class CrdnQuery extends CmmnQuery {
 
 	//YN
 	private String dstrbncYn;
+	private String towngYn;
 
 	//기타
 	private String vhrno;
@@ -151,6 +152,15 @@ public class CrdnQuery extends CmmnQuery {
 		return self();
 	}
 
+	public String getTowngYn() {
+		return ifEmpty(towngYn, () -> null);
+	}
+
+	public <T extends CrdnQuery> T setTowngYn(String towngYn) {
+		this.towngYn = towngYn;
+		return self();
+	}
+
 	public String getVhrno() {
 		return ifEmpty(vhrno, () -> null);
 	}
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 4cc9b687..ce1274cc 100644
--- a/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java
+++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java
@@ -42,12 +42,13 @@ public class Crdn06Controller extends ApplicationController {
 		mav.setViewName("fims/crdn/crdn06010-main");
 		mav.addObject("pageName", "crdn06010-main");
 
-		Map<String, List<CommonCode>> commonCodes = getCodesOf("FIM002", "FIM003", "FIM005", "FIM010", "FIM022", "FIM026", "FIM054");
+		Map<String, List<CommonCode>> commonCodes = getCodesOf("FIM002", "FIM003", "FIM005", "FIM010", "FIM022", "FIM026",
+				"FIM034", "FIM054");
 		mav.addObject("FIM003List", commonCodes.get("FIM003"));
 		mav.addObject("FIM005List", commonCodes.get("FIM005"));
 		mav.addObject("FIM010List", commonCodes.get("FIM010"));
 		mav.addObject("FIM054List", commonCodes.get("FIM054"));
-		addCodes(commonCodes, mav, "FIM002", "FIM003", "FIM010", "FIM022", "FIM026");
+		addCodes(commonCodes, mav, "FIM002", "FIM003", "FIM010", "FIM022", "FIM026", "FIM034");
 		return mav;
 	}
 
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 7157025e..86a61794 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
@@ -17,7 +17,6 @@ SELECT C.CRDN_ID               <!-- 단속 ID -->
      , C.CRDN_YMD              <!-- 단속 일자 -->
      , C.CRDN_TM               <!-- 단속 시각 -->
      , CONCAT(C.CRDN_YMD,'',C.CRDN_TM) AS CRDN_YMD_TM <!-- 단속 일시 -->
-     , '' AS APLCNT_CRDN_NM              <!-- 신고/단속자 -->
      , C.VHRNO                 <!-- 차량번호 -->
      , C.CRDN_STDG_NM          <!-- 단속 법정동 명 -->
      , C.CRDN_ROAD_NM          <!-- 단속 도로 명 -->
@@ -99,16 +98,6 @@ LEFT OUTER JOIN TB_CRDN_CVLCPT CC ON (C.CVLCPT_LINK_YN = 'Y' AND C.LINK_ID = CC.
 LEFT OUTER JOIN TB_LEVY_EXCL LE ON (C.CRDN_ID = LE.CRDN_ID AND LE.DEL_YN = 'N')
 LEFT OUTER JOIN TB_LEVY L ON (C.LEVY_ID = L.LEVY_ID)
 WHERE C.DEL_YN = 'N'
-<if test="by != null and by != '' and term != null">
-	<choose>
-		<when test="by == 'advancedOption1'">
-AND FN_GET_CODE_NM('FIM003', C.CRDN_INPT_SE_CD) LIKE CONCAT('%', #{term}, '%')
-		</when>
-		<otherwise>
-AND C.${by} LIKE CONCAT('%', #{term}, '%')
-		</otherwise>
-	</choose>
-</if>
 <if test="crdnId != null">AND C.CRDN_ID = #{crdnId}</if>
 <if test="taskSeCd != null">AND C.TASK_SE_CD = #{taskSeCd}</if>
 <if test="vhrno != null">AND C.VHRNO LIKE CONCAT('%', #{vhrno}, '%')</if>
@@ -127,7 +116,36 @@ AND C.${by} LIKE CONCAT('%', #{term}, '%')
 		<if test="schDateTo != null">AND SUBSTR(C.MDFCN_DT,1,8) <![CDATA[ <= ]]> #{schDateTo} </if>
 	</if>
 </if>
-
+<if test="crdnSttsCd != null">
+AND C.CRDN_STTS_CD = #{crdnSttsCd}
+</if>
+<if test="towngYn != null">
+AND CA.TOWNG_YN = #{towngYn}
+</if>
+<if test="by != null and by != '' and term != null">
+	<choose>
+		<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 == 'vhrno'">C.VHRNO</when>
+				<when test="by == 'crdnYmd'">C.CRDN_YMD</when>
+				<when test="by == 'crdnPlc'">C.CRDN_PLC</when>
+				<!-- TODO : 체납액 -->
+				<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 == '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 == 'levyExclEtcCn'">LE.ETC_CN</when>
+			</choose>
+			<include refid="dynamicSearch.center" />#{term}<include refid="dynamicSearch.end" />
+		</when>
+		<otherwise>
+		</otherwise>
+	</choose>
+</if>
 <include refid="utility.sortBy" />
 <include refid="utility.paging-suffix"/>
 </select>
@@ -341,7 +359,6 @@ SELECT C.CRDN_ID                                      <!-- 단속 ID -->
      , CONCAT(C.CRDN_YMD,'',C.CRDN_TM) AS CRDN_YMD_TM <!-- 단속 일시 -->
      , C.VHRNO                                        <!-- 차량번호 -->
      , C.CRDN_STDG_NM                                 <!-- 단속 법정동 명 -->
-     , '' AS APLCNT_CRDN_NM              <!-- 신고/단속자 -->
 	 , C.CRDN_STTS_CD                                 <!-- 처리상태 -->  
      , C.FFNLG_AMT                     <!-- 과태료금액 -->
      , C.ADVNTCE_AMT                   <!-- 사전통지금액 -->
diff --git a/src/main/resources/sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml b/src/main/resources/sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml
index 7850e925..ca4310f8 100644
--- a/src/main/resources/sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml
@@ -81,7 +81,6 @@ SELECT C.CRDN_ID               <!-- 단속 ID -->
      , C.CRDN_YMD              <!-- 단속 일자 -->
      , C.CRDN_TM               <!-- 단속 시각 -->
      , CONCAT(C.CRDN_YMD,'',C.CRDN_TM) AS CRDN_YMD_TM <!-- 단속 일시 -->
-     , '' AS APLCNT_CRDN_NM              <!-- 신고/단속자 -->
      , C.VHRNO                 <!-- 차량번호 -->
      , C.CRDN_STDG_NM          <!-- 단속 법정동 명 -->
      , C.CRDN_ROAD_NM          <!-- 단속 도로 명 -->
diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn03010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn03010-main.jsp
index 780cf15b..eb5296cf 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn03010-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn03010-main.jsp
@@ -71,8 +71,6 @@
 											style="min-width: 80px;">차량번호</th>
 											<th onclick="searchFromGridTitle('CRDN_STDG_NM',this.innerText,'match','perfect');"
 											style="min-width: 80px;">법정동</th>
-											<th onclick="searchFromGridTitle('APLCNT_CRDN_NM',this.innerText,'','');"
-											style="min-width: 80px;">신고/단속자</th>
 											<th class="text-orange">잔액</th>
 											<th onclick="searchFromGridTitle('ATCH_FILE_CNT',this.innerText,'match','perfect');"
 											style="min-width: 80px;">사진건수</th>
@@ -89,7 +87,6 @@
 				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{CRDN_YMD_TM}</td>
 				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{VHRNO}</td>
 				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{CRDN_STDG_NM}</td>
-				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{APLCNT_CRDN_NM}</td>
 				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-end">{BLNC}</td>
 				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-end">{ATCH_FILE_CNT}</td>
 				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-end">{CRDN_SN}</td>
diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp
index 2dd22a48..682fd18a 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp
@@ -74,6 +74,8 @@
 		                        <div class="col-6">
 									<input type="hidden" id="by--${pageName}" name="by" />
 									<input type="text" id="byOutput--${pageName}" class="form-control" readonly value="동적 검색" />
+									<input type="hidden" id="mainOption--${pageName}" name="mainOption" />
+									<input type="hidden" id="subOption--${pageName}" name="subOption" />
 									<input type="text" id="term--${pageName}" name="term" class="form-control" />
 		                        	<span class="flr">
 		                                <button type="button" class="btn btn-open-detail"
@@ -105,19 +107,15 @@
 					        		<template class="pvs dpv eca">
 							            <slot>
 							                <label class="form-label fw-bold form-search-title">견인</label>
-				                            <input type="radio" name="temp1" value="Y" />예
-				                            <input type="radio" name="temp1" value="N" />아니오
-							            </slot>
-								    </template>
-								    <template class="bpv">
-								    	<slot>
-							                <label class="form-label fw-bold form-search-title">전용차로구분</label>
-				                            <select name="temp2" class="form-select">
-				                            	<option value="">전체</option>
-				                            	<c:forEach items="${FIM005List}" var="item">
-				                            		<option value="${item.code}">${item.value}</option>
-				                            	</c:forEach>
-				                            </select>
+							                <label class="form-label">
+				                            	<input type="radio" name="towngYn" value="" class="form-check-input" checked />전체
+				                            </label>
+							                <label class="form-label">
+				                            	<input type="radio" name="towngYn" value="Y" class="form-check-input" />예
+				                            </label>
+				                            <label class="form-label">	
+				                            	<input type="radio" name="towngYn" value="N" class="form-check-input" />아니오
+				                            </label>
 							            </slot>
 								    </template>
 					        	</div>
@@ -146,26 +144,39 @@
 								<table id="DataTables_Table_0--${pageName}"
 									class="datatables-ajax table table-bordered dataTable no-footer">
 									<thead>
-										<tr id="crdnThead--${pageName}"></tr>
+										<tr id="crdnThead--${pageName}"
+										data-by="by--${pageName}" data-by-output="byOutput--${pageName}"
+										data-main-option="mainOption--${pageName}" data-sub-option="subOption--${pageName}">
+										</tr>
 									</thead>
 				                    <tbody id="crdnTbody--${pageName}">
 				                    </tbody>
 
 				                    <template id="crdnCols--${pageName}">
 										<th style="min-width: 80px;" class="cmn">No.</th>
-										<th style="min-width: 80px;" class="pvs bpv dpv eca">자료출처</th>
-										<th style="min-width: 80px;" class="cmn">차량번호</th>
-										<th style="min-width: 80px;" class="cmn">위반일시</th>
-										<th style="min-width: 80px;" class="dpv eca">신고/단속자</th>
-										<th style="min-width: 80px;" class="cmn">위반장소</th>
+										<th onclick="searchFromGridTitle('CRDN_INPT_SE_CD',this.innerText,'codeValue','FIM003');"
+										style="min-width: 80px;" class="pvs bpv dpv eca">자료출처</th>
+										<th onclick="searchFromGridTitle('VHRNO',this.innerText,'match','part');"
+										style="min-width: 80px;" class="cmn">차량번호</th>
+										<th onclick="searchFromGridTitle('CRDN_YMD','위반일자','match','perfect');"
+										style="min-width: 80px;" class="cmn">위반일시</th>
+										<th onclick="searchFromGridTitle('CRDN_PLC',this.innerText,'match','part');"
+										style="min-width: 80px;" class="cmn">위반장소</th>
 										<th style="min-width: 80px;" class="cmn">체납액</th>
-										<th style="min-width: 80px;" class="cmn">사진건수</th>
-										<th style="min-width: 80px;" class="pvs dpv eca">스티커번호</th>
-										<th style="min-width: 80px;" class="pvs bpv dpv eca">차량확인</th>
-										<th style="min-width: 80px;" class="cmn">처리상태</th>
-										<th style="min-width: 80px;" class="cmn">제외사유</th>
-										<th style="min-width: 80px;" class="cmn">제외처리일자</th>
-										<th style="min-width: 80px;" class="cmn">제외내역</th>
+										<th onclick="searchFromGridTitle('ATCH_FILE_CNT',this.innerText,'match','perfect');"
+										style="min-width: 80px;" class="cmn">사진건수</th>
+										<th onclick="searchFromGridTitle('CRDN_SN',this.innerText,'match','perfect');"
+										style="min-width: 80px;" class="pvs dpv eca">스티커번호</th>
+										<th onclick="searchFromGridTitle('PARKNG_PSBLTY_RSLT_CD',this.innerText,'codeValue','FIM034');"
+										style="min-width: 80px;" class="dpv">장애차량확인</th>
+										<th onclick="searchFromGridTitle('CRDN_STTS_CD',this.innerText,'codeValue','FIM010');"
+										style="min-width: 80px;" class="cmn">처리상태</th>
+										<th onclick="searchFromGridTitle('LEVY_EXCL_RSN_CD',this.innerText,'codeValue','FIM022');"
+										style="min-width: 80px;" class="cmn">제외사유</th>
+										<th onclick="searchFromGridTitle('LEVY_EXCL_YMD',this.innerText,'ymd','');"
+										style="min-width: 80px;" class="cmn">제외처리일자</th>
+										<th onclick="searchFromGridTitle('LEVY_EXCL_ETC_CN',this.innerText,'match','part');"
+										style="min-width: 80px;" class="cmn">제외내역</th>
 				                    </template>
 									<template id="crdnRow--${pageName}">
 										<tr data-key="{CRDN_ID}">
@@ -173,12 +184,11 @@
 											<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center cmn">{CRDN_INPT_SE_CD}</td>
 				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center cmn">{VHRNO}</td>
 				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center cmn">{CRDN_YMD_TM}</td>
-				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center dpv eca">{APLCNT_CRDN_NM}</td>
 				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center cmn">{CRDN_PLC}</td>
 				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-end cmn">{체납액}</td>
 				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center cmn">{ATCH_FILE_CNT}</td>
 				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center pvs dpv eca">{CRDN_SN}</td>
-				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center pvs bpv dpv eca">{차량확인}</td>
+				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center dpv">{PARKNG_PSBLTY_RSLT_CD}</td>
 				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center cmn">{CRDN_STTS_CD}</td>
 				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center cmn">{LEVY_EXCL_RSN_CD}</td>
 				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center cmn">{LEVY_EXCL_YMD}</td>
@@ -186,10 +196,16 @@
 			                    		</tr>
 									</template>
 									<template id="crdnNotFound--${pageName}">
-										<tr class="dpv eca">
+										<tr class="dpv">
+											<td valign="top" colspan="14" class="dataTables_empty text-center">단속 정보를 찾지 못했습니다.</td>
+										</tr>
+										<tr class="eca">
+											<td valign="top" colspan="14" class="dataTables_empty text-center">단속 정보를 찾지 못했습니다.</td>
+										</tr>
+										<tr class="pvs">
 											<td valign="top" colspan="14" class="dataTables_empty text-center">단속 정보를 찾지 못했습니다.</td>
 										</tr>
-										<tr class="pvs bpv">
+										<tr class="bpv">
 											<td valign="top" colspan="14" class="dataTables_empty text-center">단속 정보를 찾지 못했습니다.</td>
 										</tr>
 										<tr class="tpv">
@@ -222,6 +238,7 @@ var FIM003 = new CommonCodes(${FIM003});
 var FIM010 = new CommonCodes(${FIM010});
 var FIM022 = new CommonCodes(${FIM022});
 var FIM026 = new CommonCodes(${FIM026});
+var FIM034 = new CommonCodes(${FIM034});
 pageObject["${pageName}"] = {};
 
 
@@ -253,7 +270,8 @@ $(document).ready(function(){
 	    	CRDN_STTS_CD 	: FIM010,
 	    	CRDN_REG_SE_CD: FIM026,
 	    	LEVY_EXCL_YMD : dateFormat,
-	    	LEVY_EXCL_RSN_CD : FIM022
+	    	LEVY_EXCL_RSN_CD : FIM022,
+	    	PARKNG_PSBLTY_RSLT_CD : FIM034
 		}
 	});
 	$P.crdnControl.defaultFetchSize = FETCH_XS;