From 36521f8b866ea4610c28f0d2d7f30af01ab02fac Mon Sep 17 00:00:00 2001
From: leebeomjun <leebj91@xit.co.kr>
Date: Tue, 20 Jun 2023 14:26:29 +0900
Subject: [PATCH] =?UTF-8?q?=EB=AA=85=EB=AA=85=EA=B7=9C=EC=B9=99(=EC=95=BD?=
 =?UTF-8?q?=EC=96=B4+=EC=88=AB=EC=9E=904=EC=9E=90=EB=A6=AC)=EC=97=90=20?=
 =?UTF-8?q?=EB=94=B0=EB=A5=B8=20URL,=20=EC=BB=A8=ED=8A=B8=EB=A1=A4?=
 =?UTF-8?q?=EB=9F=AC=EB=AA=85=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...r.java => AbstractCrdn0600Controller.java} |  6 +-
 ...ontroller.java => Crdn0600Controller.java} | 20 ++++---
 ...Data-main.jsp => crdnDataInquire-main.jsp} | 59 +++++++------------
 3 files changed, 36 insertions(+), 49 deletions(-)
 rename src/main/java/cokr/xit/fims/crdn/web/{AbstractCrdnController.java => AbstractCrdn0600Controller.java} (88%)
 rename src/main/java/cokr/xit/fims/crdn/web/{CrdnController.java => Crdn0600Controller.java} (80%)
 rename src/main/webapp/WEB-INF/jsp/fims/crdn/{initData-main.jsp => crdnDataInquire-main.jsp} (88%)

diff --git a/src/main/java/cokr/xit/fims/crdn/web/AbstractCrdnController.java b/src/main/java/cokr/xit/fims/crdn/web/AbstractCrdn0600Controller.java
similarity index 88%
rename from src/main/java/cokr/xit/fims/crdn/web/AbstractCrdnController.java
rename to src/main/java/cokr/xit/fims/crdn/web/AbstractCrdn0600Controller.java
index 562347d3..838ff160 100644
--- a/src/main/java/cokr/xit/fims/crdn/web/AbstractCrdnController.java
+++ b/src/main/java/cokr/xit/fims/crdn/web/AbstractCrdn0600Controller.java
@@ -9,7 +9,7 @@ import cokr.xit.fims.crdn.service.CrdnQuery;
 import cokr.xit.fims.crdn.service.CrdnService;
 import cokr.xit.foundation.web.AbstractController;
 
-public class AbstractCrdnController extends ApplicationController {
+public class AbstractCrdn0600Controller extends ApplicationController {
 
 	@Resource(name="crdnService")
 	private CrdnService crdnService;
@@ -36,13 +36,13 @@ public class AbstractCrdnController extends ApplicationController {
 	
 	/**지정하는 단속아이디의 단속 정보를 반환한다.
 	 * @param crdnId 단속 아이디
-	 * @return fims/crdn/initData-info
+	 * @return fims/crdn/crdnData-info
 	 * <pre><code> {
 	 *     "crdnInfo": {...}
 	 * }</code></pre>
 	 */
 	public ModelAndView getCrdnInfo(String crdnId) {
-		ModelAndView mav = new ModelAndView("fims/crdn/initData-info");
+		ModelAndView mav = new ModelAndView("fims/crdn/crdnData-info");
 		if (!isEmpty(crdnId)) {
 			mav.addObject("crdnInfo", crdnService.getCrdnInfo(crdnId));
 		}
diff --git a/src/main/java/cokr/xit/fims/crdn/web/CrdnController.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn0600Controller.java
similarity index 80%
rename from src/main/java/cokr/xit/fims/crdn/web/CrdnController.java
rename to src/main/java/cokr/xit/fims/crdn/web/Crdn0600Controller.java
index 98babbf5..109018f0 100644
--- a/src/main/java/cokr/xit/fims/crdn/web/CrdnController.java
+++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn0600Controller.java
@@ -22,22 +22,24 @@ import cokr.xit.foundation.web.AbstractController;
  */
 @Controller
 @RequestMapping(name="단속관리", value="/crdn")
-public class CrdnController extends AbstractCrdnController {
+public class Crdn0600Controller extends AbstractCrdn0600Controller {
 	
 	@Resource(name = "codeService")
 	private CodeService codeService;
 
-	/** 단속 초기자료 관리 메인화면을 연다.
-	 * @return fims/crdn/initData-main
+	/** 단속 자료 조회 메인화면을 연다.
+	 * @return fims/crdn/crdnDataInquire-main
 	 */
-	@RequestMapping(name="단속 초기자료 메인", value="/initData/main.do")
-	public ModelAndView initDataMain() {
+	@RequestMapping(name="단속 자료 조회 메인", value="/crdn0600/main.do")
+	public ModelAndView crdnDataInquireMain() {
 		ModelAndView mav = new ModelAndView();
-		mav.setViewName("fims/crdn/initData-main");
-		mav.addObject("pageSuffix","initData-main");
+		mav.setViewName("fims/crdn/crdnDataInquire-main");
+		mav.addObject("pageSuffix","crdnDataInquire-main");
 		
-		Map<String, List<CommonCode>> commonCodes = getCodesOf("FIM001", "FIM002", "FIM026");
-		mav.addObject("FIM001", commonCodes.get("FIM001"));
+		Map<String, List<CommonCode>> commonCodes = getCodesOf("FIM001", "FIM002", "FIM010", "FIM026");
+		mav.addObject("FIM001List", commonCodes.get("FIM001"));
+		mav.addObject("FIM002List", commonCodes.get("FIM002"));
+		mav.addObject("FIM010List", commonCodes.get("FIM010"));
 		addCodes(commonCodes, mav, "FIM002", "FIM026");
 		return mav;
 	}
diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/initData-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdnDataInquire-main.jsp
similarity index 88%
rename from src/main/webapp/WEB-INF/jsp/fims/crdn/initData-main.jsp
rename to src/main/webapp/WEB-INF/jsp/fims/crdn/crdnDataInquire-main.jsp
index 522a8732..d9241b31 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/crdn/initData-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdnDataInquire-main.jsp
@@ -25,29 +25,14 @@
 				                        <div class="col-12">
 				                            <label class="form-label fw-bold form-search-title">시스템구분</label>
 				                            <span class="form-search-linebox">
-												<input type="radio" id="sysSeCd1--${pageSuffix}" name="sysSeCd" value="PVS"
-												onchange="fnResetAndChangeBiz(this.value);" />
-												<label for="sysSeCd1">주정차</label>
-												<input type="radio" id="sysSeCd2--${pageSuffix}" name="sysSeCd" value="BPV"
-												onchange="fnResetAndChangeBiz(this.value);" />
-												<label for="sysSeCd2">전용차로</label>
-												<input type="radio" id="sysSeCd3--${pageSuffix}" name="sysSeCd" value="DPV"
-												onchange="fnResetAndChangeBiz(this.value);" />
-												<label for="sysSeCd3">장애인</label>
-												<input type="radio" id="sysSeCd4--${pageSuffix}" name="sysSeCd" value="ECA"
-												onchange="fnResetAndChangeBiz(this.value);" />
-												<label for="sysSeCd4">전기차</label>
-
-				                            <%--
-
-				                            <code:radio
-				                            grpId="FIM001"
-				                            id="sysSeCd"
-				                            name="sysSeCd"
-				                            cls="form-check-input"
-				                            alt="시스템구분"/>
-
-				                             --%>
+												<c:forEach items="${FIM001List}" var="item">
+													<label>
+														<input name="sysSeCd" type="radio" value="${item.code}"
+														class="form-check-input" alt="시스템구분"
+														onchange="fnResetAndChangeBiz(this.value);">
+														${item.value}
+													</label> 
+												</c:forEach>
 				                            </span>
 				                        </div>
 				                        <div class="col-12">
@@ -66,27 +51,27 @@
 				                        </div>
 				                        <div class="col-12">
 				                            <label class="form-label fw-bold form-search-title">단속구분</label>
-				                            <span class="form-search-linebox">
-				                            <%--
-				                                <code:radio type="CMM_ETC2" id="crdnSeCd" name="crdnSeCd" grpId="FIM002"
-				                                         cls="form-check-input" alt="단속구분" />
-				                            --%>
-				                            </span>
-
+				                            <select id="crdnSeCd--${pageSuffix}" name="crdnSeCd" class="form-select">
+				                            	<option value="">전체</option>
+				                            	<c:forEach items="${FIM002List}" var="item">
+				                            		<option value="${item.code}">${item.value}</option>
+				                            	</c:forEach>
+				                            </select>
 				                        </div>
 				                        <div class="col-12">
 				                            <label class="form-label fw-bold form-search-title">자료상태</label>
-				                            <%--
-				                            <code:select id="crdnSttsCd" name="crdnSttsCd"
-				                                         grpId="FIM010" defaultSelect="01" title="단속처리상태" cls="form-select" alt="단속처리상태" disabled="false"/>
-				                                --%>
+				                            <select id="crdnSttsCd--${pageSuffix}" name="crdnSttsCd" class="form-select">
+				                            	<option value="">전체</option>
+				                            	<c:forEach items="${FIM010List}" var="item">
+				                            		<option value="${item.code}">${item.value}</option>
+				                            	</c:forEach>
+				                            </select>
+				                                
 				                            <select id="schOpt--${pageSuffix}" name="schOpt" class="form-select">
 				                                <option value="schVhrno">차량번호</option>
 				                            </select>
-
 				                            <input type="text" id="schWord--${pageSuffix}" name="schWord" class="form-control" value="" />
 
-
 				                            <span class="flr">
 				                                <button type="button" class="btn btn-open-detail btn-sm" data-bs-toggle="collapse" data-bs-target="#searchDetail">
 				                                    <i class="bx bx-chevron-down"></i>
@@ -284,7 +269,7 @@ var fnBiz = {
                ,schDateOpt: form.find("[name='schDateOpt']").val()
                ,schDateFrom: form.find("[name='schDateFrom']").val()
                ,schDateTo: form.find("[name='schDateTo']").val()
-               ,crdnSeCd: form.find("[name='crdnSeCd']:checked").val()
+               ,crdnSeCd: form.find("[name='crdnSeCd']").val()
                ,crdnSttsCd: form.find("[name='crdnSttsCd']").val()
                ,ctznAnsYn: form.find("[name='ctznAnsYn']:checked").val()
                ,fetchSize: 30