From b1fbf6b16d7c9ab48cb2a34ed3bb8b4fb6110c75 Mon Sep 17 00:00:00 2001
From: leebeomjun <leebj91@xit.co.kr>
Date: Wed, 1 Nov 2023 18:08:58 +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(=EC=9C=84=EB=B0=98=ED=95=AD=EB=AA=A9=20?=
 =?UTF-8?q?=EC=A1=B0=ED=9A=8C=EC=A1=B0=EA=B1=B4=20=EC=B6=94=EA=B0=80)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xit/fims/sprt/web/Sprt01Controller.java   | 14 ++++++-
 .../fims/sprt/integrationSearch-mapper.xml    |  3 ++
 .../WEB-INF/jsp/fims/sprt/sprt01010-main.jsp  | 40 ++++++++++++++++++-
 .../WEB-INF/jsp/fims/sprt/sprt01020-info.jsp  | 12 +++---
 4 files changed, 59 insertions(+), 10 deletions(-)

diff --git a/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java b/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java
index e0991c8c..bf72aa78 100644
--- a/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java
+++ b/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java
@@ -49,15 +49,25 @@ public class Sprt01Controller extends ApplicationController {
 	public ModelAndView integrationSearchMain(HttpServletRequest req) {
 		ModelAndView mav = new ModelAndView("fims/sprt/sprt01010-main");
 
-		Map<String, List<CommonCode>> commonCodes = getCodesOf("FIM003", "FIM010", "FIM026", "FIM054");
+		Map<String, List<CommonCode>> commonCodes = getCodesOf("FIM003", "FIM010", "FIM026", "FIM054"
+				,"FIM004","FIM005","FIM006","FIM061","FIM064");
 
 		mav.addObject("VLTNList", null);
+
 		mav.addObject("FIM003List", commonCodes.get("FIM003"));
 		mav.addObject("FIM010List", commonCodes.get("FIM010"));
 		mav.addObject("FIM026List", commonCodes.get("FIM026"));
 		mav.addObject("FIM054List", commonCodes.get("FIM054"));
 
-		addCodes(commonCodes, mav, "FIM003", "FIM010", "FIM026", "FIM054", "VLTN");
+		mav.addObject("FIM004List", commonCodes.get("FIM004"));
+		mav.addObject("FIM005List", commonCodes.get("FIM005"));
+		mav.addObject("FIM006List", commonCodes.get("FIM006"));
+		mav.addObject("FIM061List", commonCodes.get("FIM061"));
+		mav.addObject("FIM064List", commonCodes.get("FIM064"));
+
+
+		addCodes(commonCodes, mav, "FIM003", "FIM010", "FIM026", "FIM054"
+				,"FIM004","FIM005","FIM006","FIM061","FIM064");
 
 		mav.addObject("pageName", "sprt01010");// View(jsp)에서 사용할 id 뒤에 붙일 suffix
 
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 be40350e..366adce0 100644
--- a/src/main/resources/sql/mapper/fims/sprt/integrationSearch-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/sprt/integrationSearch-mapper.xml
@@ -251,6 +251,9 @@ LEFT OUTER JOIN TB_RCVMT         R   ON (L.LEVY_ID = R.LEVY_ID AND R.DEL_YN = 'N
       <when test="item.name == 'epayno'">
        AND L.EPAYNO = #{item.value}
       </when>
+      <when test="item.name == 'vltnCd'">
+       AND VI.VLTN_CD = #{item.value}
+      </when>
       <when test="item.name == 'crdnSttsCd'">
        AND C.CRDN_STTS_CD = #{item.value}
       </when>
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 1000858d..e1245824 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
@@ -38,6 +38,12 @@ var fastSearch = ${fastSearch};
 // 공통 코드
 var FIM054 = new CommonCodes(${FIM054}, true);
 
+var FIM004 = new CommonCodes(${FIM004}, true);
+var FIM005 = new CommonCodes(${FIM005}, true);
+var FIM006 = new CommonCodes(${FIM006}, true);
+var FIM061 = new CommonCodes(${FIM061}, true);
+var FIM064 = new CommonCodes(${FIM064}, true);
+	
 /**************************************************************************
  * DatasetControl
  **************************************************************************/
@@ -135,6 +141,38 @@ integrationSearch.getParams = () => {
 }
 
 // 초기화
+integrationSearch.fnResetAndChangeBiz = (taskSeCd) => {
+	
+	// 항목 초기화
+	$("#ischVltnCd--${pageName}").empty();
+
+	$("#ischVltnCd--${pageName}").append("<option value=''>" + "전체" + "</option>");
+	
+	
+	// 업무에 따른 위반 내용
+	var vltnIdCode = [];
+	if (taskSeCd == "PVS") {								// 주정차 위반
+		vltnIdCode = FIM004.list();
+	} else if (taskSeCd == "BPV") {							// 전용차로 위반
+		vltnIdCode = FIM005.list();
+	} else if (taskSeCd == "DPV") {							// 장애인 전용
+		vltnIdCode = FIM006.list();
+	} else if (taskSeCd == "ECA") {							// 전기차 주차 위반
+		vltnIdCode = FIM061.list();
+	} else if (taskSeCd == "TPV") {							// 밤샘 주차 위반
+		vltnIdCode = FIM064.list();
+	}
+	
+	if(taskSeCd != ""){
+		$(vltnIdCode).each(function(index, item) {
+			$("#ischVltnCd--${pageName}").append("<option value='" + vltnIdCode[index].code +"'>" + vltnIdCode[index].value + "</option>");
+		})
+	}
+	
+	integrationSearch.fnReset();
+	
+}
+
 integrationSearch.fnReset = () => {
 	
 	integrationSearchControl.updataset.clear();
@@ -355,7 +393,7 @@ $(document).ready(function() {
 	// 보안모드
     fn_securityModeToggle($("#securityMode--top").is(":checked"));
 
-	integrationSearch.fnReset();
+	integrationSearch.fnResetAndChangeBiz("");
 	
 	if(fastSearch != null){
 		if(fastSearch.fastBy == "vhrno"){
diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01020-info.jsp
index e59900ac..307ea6be 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01020-info.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01020-info.jsp
@@ -58,13 +58,13 @@
 					<span class="form-search-linebox">
 						<label>
 							<input type="radio" class="form-check-input" name="taskSeCd" alt="업무구분"
-								value="" onchange="integrationSearch.fnReset();" checked="checked">
+								value="" onchange="integrationSearch.fnResetAndChangeBiz('');" checked="checked">
 							전체
 						</label>
 						<c:forEach items="${FIM054List}" var="item">
 							<label>
 								<input type="radio" class="form-check-input" name="taskSeCd" alt="업무구분"
-									value="${item.code}" onchange="integrationSearch.fnReset();">
+									value="${item.code}" onchange="integrationSearch.fnResetAndChangeBiz(this.value);">
 								${item.value}
 							</label>
 						</c:forEach>
@@ -175,13 +175,11 @@
 					<label class="form-label fw-bold form-search-title text-end">전자납부번호</label>
 					<input type="text" id="ischEpayno--${pageName}" name="ischEpayno" class="form-control w-px-150" />
 				</div>
-				<!-- 위반내용 -->
+				<!-- 위반항목 -->
 				<div class="col-6">
-					<label class="form-label fw-bold form-search-title text-end">위반내용</label>
+					<label class="form-label fw-bold form-search-title text-end">위반항목</label>
 					<select id="ischVltnCd--${pageName}" name="ischVltnCd" class="form-select">
-						<c:forEach items="${VLTNList}" var="item">
-							<option value="${item.code}">${item.value}</option>
-		                </c:forEach>
+						<option value="">전체</option>
 					</select>
 				</div>
 				<!-- 처리상태 -->