From 6ae9e766c77a459b717fd5092d8df1d36ca4e684 Mon Sep 17 00:00:00 2001
From: leebeomjun <leebj91@xit.co.kr>
Date: Mon, 3 Jul 2023 17:30:55 +0900
Subject: [PATCH] =?UTF-8?q?=EB=8B=A8=EC=86=8D=EA=B4=80=EB=A6=AC=20?=
 =?UTF-8?q?=ED=99=94=EB=A9=B4=20=EC=88=98=EC=A0=95(=EC=97=85=EB=AC=B4?=
 =?UTF-8?q?=EB=B3=84=20=EC=A1=B0=ED=9A=8C=EC=A1=B0=EA=B1=B4,=20=EC=97=85?=
 =?UTF-8?q?=EB=AC=B4=EB=B3=84=20=EA=B7=B8=EB=A6=AC=EB=93=9C=20=ED=91=9C?=
 =?UTF-8?q?=EC=8B=9C=ED=95=AD=EB=AA=A9)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xit/fims/crdn/web/Crdn06Controller.java   |  3 +-
 .../WEB-INF/jsp/fims/crdn/crdn06010-main.jsp  | 63 +++++++++++++++----
 2 files changed, 53 insertions(+), 13 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 e3190478..1e67f2c7 100644
--- a/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java
+++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java
@@ -28,8 +28,9 @@ public class Crdn06Controller extends ApplicationController {
 		mav.setViewName("fims/crdn/crdn06010-main");
 		mav.addObject("pageName", "crdn06010-main");
 
-		Map<String, List<CommonCode>> commonCodes = getCodesOf("FIM002", "FIM003", "FIM010", "FIM026", "FIM054");
+		Map<String, List<CommonCode>> commonCodes = getCodesOf("FIM002", "FIM003", "FIM005", "FIM010", "FIM026", "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", "FIM026");
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 0df6611e..a26943ff 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
@@ -100,8 +100,28 @@
 
 		                        </div>
 					        </div>
+					        <div class="row" id="searchByTaskArea--${pageName}">
+					        </div>
 				        </div>
 				    </form>
+
+				    <template id="taskSearchOption--${pageName}">
+			            <div class="pvs dpv eca col-6">
+			                <label class="form-label fw-bold form-search-title">견인</label>
+                            <input type="radio" name="temp1" value="Y" />예
+                            <input type="radio" name="temp1" value="N" />아니오
+			            </div>
+			            <div class="col-6">
+			                <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>
+			            </div>
+				    </template>
+
 				    <div>
 				        <span class="container-page-btn">
 				            <div class="d-flex flex-row justify-content-between">
@@ -121,11 +141,12 @@
 							<div id="table-responsive--${pageName}" class="table-responsive"
 								style="overflow-x: scroll;height:400px;overflow-y: scroll;">
 								<table id="DataTables_Table_0--${pageName}"
-									class="datatables-ajax table table-bordered dataTable no-footer"
-									aria-describedby="DataTables_Table_0_info"
-									>
-									<thead>
-										<tr id="crdnTheadTr--${pageName}">
+									class="datatables-ajax table table-bordered dataTable no-footer">
+									<thead id="crdnThead--${pageName}"></thead>
+				                    <tbody id="crdnTbody--${pageName}"></tbody>
+
+				                    <template id="crdnCols--${pageName}">
+										<tr class="dpv eca">
 											<th width="80">No.</th>
 											<th width="80">자료출처</th>
 											<th width="80">차량번호</th>
@@ -142,10 +163,12 @@
 											<th width="80">제외처리일자</th>
 											<th width="80">제외내역</th>
 										</tr>
-				                    </thead>
-				                    <tbody id="crdnTbody--${pageName}"></tbody>
+										<tr class="pvs bpv">
+											<th width="80">트래픽~~</th>
+										</tr>
+				                    </template>
 									<template id="crdnRow--${pageName}">
-										<tr data-key="{CRDN_ID}">
+										<tr data-key="{CRDN_ID}" class="dpv eca">
 											<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-end">{ROW_NUM}</td>
 											<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{CRDN_INPT_SE_CD}</td>
 				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{VHRNO}</td>
@@ -162,11 +185,17 @@
 				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{제외처리일자}</td>
 				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{제외내역}</td>
 				                    	</tr>
+				                    	<tr class="pvs bpv">
+											<td width="80">트래픽~~</td>
+										</tr>
 									</template>
-									<template id="crdnNotFound--${pageName}">
-										<tr>
+									<template id="crdnNotFound--${pageName}" class="dpv eca">
+										<tr class="dpv eca">
 											<td valign="top" colspan="15" class="dataTables_empty text-center">단속 정보를 찾지 못했습니다.</td>
 										</tr>
+										<tr class="pvs bpv">
+											<td valign="top" colspan="1" class="dataTables_empty text-center">단속 정보를 찾지 못했습니다.</td>
+										</tr>
 									</template>
 								</table>
 							</div>
@@ -260,6 +289,15 @@ $(document).ready(function(){
 		$P.fnReset();
 		$P.crdnControl.urls.load = wctx.url("/crdn/crdn06/010/"+ taskSeCd +"/list.do");
 		$P.crdnControl.urls.getInfo = wctx.url("/sprt/sprt01/020/"+ taskSeCd +"/info.do");
+
+		var cssForTask = taskSeCd.toLowerCase();
+
+		var searchOption = document.getElementById("taskSearchOption--${pageName}").content.querySelector("."+cssForTask)?.outerHTML;
+		if(!searchOption) searchOption = "";
+		$("#searchByTaskArea--${pageName}").html(searchOption);
+
+		var cols = document.getElementById("crdnCols--${pageName}").content.querySelector("."+cssForTask).outerHTML;
+		$("#crdnThead--${pageName}").html(cols);
 	}
 
 	$P.searchCrdnList = () => {
@@ -284,8 +322,9 @@ $(document).ready(function(){
 
 	    var crdnList = $P.crdnControl.dataset;
 		var empty = crdnList.empty;
-		var notFound = [document.getElementById("crdnNotFound--${pageName}").innerHTML];
-		var found = document.getElementById("crdnRow--${pageName}").innerHTML;
+		var cssForTask = $("#frmSearch--${pageName} [name='taskSeCd']:checked").val().toLowerCase();
+		var notFound = [document.getElementById("crdnNotFound--${pageName}").content.querySelector("."+cssForTask).outerHTML];
+		var found = document.getElementById("crdnRow--${pageName}").content.querySelector("."+cssForTask).outerHTML;
 		var replacer = (str, dataItem) => str
 			.replace(/{onclick}/gi, "pageObject['${pageName}'].clickCrdnList('" + dataItem.getValue("CRDN_ID") + "');")
 			.replace(/{ondblclick}/gi, "pageObject['${pageName}'].dblclickCrdnList('" + dataItem.getValue("CRDN_ID") + "');");