From c26cf10b15b202b3342326962244871d38689fb0 Mon Sep 17 00:00:00 2001
From: leebeomjun <leebj91@xit.co.kr>
Date: Tue, 11 Jul 2023 15:53:10 +0900
Subject: [PATCH] =?UTF-8?q?=EC=88=98=EA=B8=B0=20=EB=93=B1=EB=A1=9D=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95(=EA=B3=BC=ED=83=9C=EB=A3=8C=EC=97=85?=
 =?UTF-8?q?=EB=AC=B4=EB=B3=84=20=EC=9E=85=EB=A0=A5=20=ED=95=AD=EB=AA=A9=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xit/fims/crdn/web/Crdn05Controller.java   |  30 +++--
 .../WEB-INF/jsp/fims/crdn/crdn05030-info.jsp  | 117 +++++++++++++-----
 2 files changed, 108 insertions(+), 39 deletions(-)

diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java
index ec875dfb..568fec57 100644
--- a/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java
+++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java
@@ -61,20 +61,34 @@ public class Crdn05Controller extends ApplicationController {
 		String urlTaskSeCd = request.getServletPath().split("/")[1];
 		mav.addObject("taskSeCd", urlTaskSeCd);
 
-		Map<String, List<CommonCode>> commonCodes = getCodesOf("FIM011","FIM034","FIM053","LVS005");
+		String vltnByTask = "";
+
+		switch(urlTaskSeCd) {
+			case "PVS" -> { vltnByTask = "WEB002"; }
+			case "BPV" -> { vltnByTask = "FIM005"; }
+			case "DPV","ECA" -> { vltnByTask = "FIM006"; }
+		}
+		Map<String, List<CommonCode>> commonCodes = getCodesOf("FIM011","FIM053","LVS005",vltnByTask);
 		mav.addObject("FIM011List", commonCodes.get("FIM011"));
-		mav.addObject("FIM034List", commonCodes.get("FIM034"));
 		mav.addObject("FIM053List", commonCodes.get("FIM053"));
 		mav.addObject("LVS005List", commonCodes.get("LVS005"));
+		mav.addObject("VLTNList", commonCodes.get(vltnByTask));
 
 		switch(urlTaskSeCd) {
-			case "PVS" -> {}
-			case "BPV" -> {}
+			case "PVS" -> {
+				commonCodes = getCodesOf("FIM002","FIM007");
+				mav.addObject("FIM002List", commonCodes.get("FIM002"));
+				mav.addObject("FIM007List", commonCodes.get("FIM007"));
+			}
+			case "BPV" -> {
+				commonCodes = getCodesOf("FIM002");
+				mav.addObject("FIM002List", commonCodes.get("FIM002"));
+			}
 			case "DPV" -> {
-				commonCodes = getCodesOf("FIM006");
-				mav.addObject("FIM006List", commonCodes.get("FIM006"));
+				commonCodes = getCodesOf("FIM034");
+				mav.addObject("FIM034List", commonCodes.get("FIM034"));
 			}
-			case "ECA" -> {}
+			case "ECA" -> { }
 		}
 
 		return mav;
@@ -92,6 +106,8 @@ public class Crdn05Controller extends ApplicationController {
 
 		List<FileInfo> fileInfoList = new FileInfoFactory().makeFileInfos(null, uploadFileList);
 
+		crdn.setCrdnRegSeCd("01");
+		crdn.setCrdnInptSeCd("03");//TODO : 사용자 기관의 시청,구청 구분
 		boolean saved = crdn05Service.create(crdn, fileInfoList);
 
 
diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05030-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05030-info.jsp
index c7d14441..13c24d37 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05030-info.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05030-info.jsp
@@ -4,9 +4,9 @@
 <div class="d-flex flex-row justify-content-evenly">
 
 	<div class="card" style="max-width:1100px;" title="단속정보">
-		<form id="frmEdit--${pageName}" class="dpv eca">
+		<form id="frmEdit--${pageName}">
 			<input name="crdnId" type="hidden" data-map="CRDN_ID" />
-			<input name="taskSeCd" type="hidden" value="${taskSeCd}" />
+			<input id="taskSeCd--${pageName}" name="taskSeCd" type="hidden" value="${taskSeCd}" />
 			<div class="row g-1">
 				<div class="col-md-4">
 					<label for="crdnYmd--${pageName}" class="w-px-150 bg-lighter pe-2 col-form-label text-sm-end required">
@@ -34,17 +34,12 @@
 						위반내용
 					</label>
 					<select id="vltnCd--${pageName}" name="vltnCd" class="form-select" data-map="VLTN_CD">
-						<c:forEach items="${FIM006List}" var="item">
+						<c:forEach items="${VLTNList}" var="item">
 							<option value="${item.code}">${item.value}</option>
 		                </c:forEach>
 					</select>
 				</div>
-				<div class="col-md-12">
-					<label class="w-px-150 bg-lighter pe-2 col-form-label text-sm-end">
-						단속자,신고자
-					</label>
-					(보류)
-				</div>
+				
 				<div class="col-md-6 select2-primary">
 					<label for="crdnStdgNm--${pageName}" class="w-px-150 bg-lighter pe-2 col-form-label text-sm-end">법정동</label>
 					<input type="text" id="crdnStdgNm--${pageName}" name="crdnStdgNm" data-map="CRDN_STDG_NM" class="form-control" readonly/>
@@ -54,28 +49,9 @@
 					<label for="crdnPlc--${pageName}" class="w-px-150 bg-lighter pe-2 col-form-label text-sm-end">위반장소</label>
 					<input type="text" id="crdnPlc--${pageName}" name="crdnPlc" data-map="CRDN_PLC" class="form-control" />
 				</div>
-				<div class="col-md-12">
-					<label for="crdnSn--${pageName}" class="w-px-150 bg-lighter pe-2 col-form-label text-sm-end">발행번호</label>
-					<input type="text" id="crdnSn--${pageName}" name="crdnSn" data-map="CRDN_SN" class="form-control" />
-				</div>
-				<div class="col-md-12">
-					<label for="towngYn--${pageName}" class="w-px-150 bg-lighter pe-2 col-form-label text-sm-end">견인지시</label>
-					<select id="towngYn--${pageName}" name="towngYn" class="form-select" data-map="TOWNG_YN">
-						<c:forEach items="${FIM053List}" var="item">
-							<option value="${item.code}">${item.value}</option>
-		                </c:forEach>
-					</select>
-				</div>
-				<div class="col-md-12">
-					<label for="parkngPsbltyRsltCd--${pageName}" class="w-px-150 bg-lighter pe-2 col-form-label text-sm-end">장애차량확인</label>
-					<select id="parkngPsbltyRsltCd--${pageName}" name="parkngPsbltyRsltCd" data-map="PARKNG_PSBLTY_RSLT_CD" class="form-select">
-						<c:forEach items="${FIM034List}" var="item">
-							<c:if test="${item.code == '0' or item.code == '1'}">
-								<option value="${item.code}">${item.value}</option>
-							</c:if>
-		                </c:forEach>
-					</select>
-				</div>
+				
+				
+				
 				<div class="col-md-12">
 					<label for="etcCn--${pageName}" class="w-px-150 bg-lighter pe-2 col-form-label text-sm-end">특기사항</label>
 					<input type="text" id="etcCn--${pageName}" name="etcCn" data-map="ETC_CN" class="form-control" />
@@ -134,12 +110,18 @@
 		                </c:forEach>
 					</select>
 				</div>
+				
+				<div id="editByTask--${pageName}">
+				
+				</div>
+				
 				<div class="col-md-6">
 					<label for="doGuidance--${pageName}">
 						<input type="checkbox" id="doGuidance--${pageName}" name="doGuidance" class="form-check-input" />계도처리
 					</label>
 				</div>
 			</div>
+
 			<div class="row mt-4 justify-content-end mb-3">
 				<div class="col-md-6">
 					<div class="row justify-content-end">
@@ -149,6 +131,7 @@
 					</div>
 				</div>
 			</div>
+			
 		</form>
 	</div>
 	<div class="card" style="width:400px;">
@@ -160,7 +143,72 @@
 		</div>
 	</div>
 
-
+	<template id="taskItem--${pageName}">
+		<div class="col-md-12 dpv eca">
+			<label class="w-px-150 bg-lighter pe-2 col-form-label text-sm-end">
+				단속자,신고자
+			</label>
+			(보류)
+		</div>
+		<div class="col-md-12 dpv eca pvs">
+			<label for="towngYn--${pageName}" class="w-px-150 bg-lighter pe-2 col-form-label text-sm-end">견인지시</label>
+			<select id="towngYn--${pageName}" name="towngYn" class="form-select" data-map="TOWNG_YN">
+				<c:forEach items="${FIM053List}" var="item">
+					<option value="${item.code}">${item.value}</option>
+                </c:forEach>
+			</select>
+		</div>
+		<div class="col-md-12 dpv">
+			<label for="parkngPsbltyRsltCd--${pageName}" class="w-px-150 bg-lighter pe-2 col-form-label text-sm-end">장애차량확인</label>
+			<select id="parkngPsbltyRsltCd--${pageName}" name="parkngPsbltyRsltCd" data-map="PARKNG_PSBLTY_RSLT_CD" class="form-select">
+				<c:forEach items="${FIM034List}" var="item">
+					<c:if test="${item.code == '0' or item.code == '1'}">
+						<option value="${item.code}">${item.value}</option>
+					</c:if>
+                </c:forEach>
+			</select>
+		</div>
+		<div class="col-md-12 dpv eca pvs">
+			<label for="crdnSn--${pageName}" class="w-px-150 bg-lighter pe-2 col-form-label text-sm-end">스티커번호</label>
+			<input type="text" id="crdnSn--${pageName}" name="crdnSn" data-map="CRDN_SN" class="form-control" />
+		</div>
+		<div class="col-md-12 bpv">
+			<label for="dtlCrdnPlc--${pageName}" class="w-px-150 bg-lighter pe-2 col-form-label text-sm-end">상세위반장소</label>
+			<input type="text" id="dtlCrdnPlc--${pageName}" name="dtlCrdnPlc" data-map="DTL_CRDN_PLC" class="form-control" />
+		</div>
+		<div class="col-md-12 pvs bpv">
+			<label for="teamNm--${pageName}" class="w-px-150 bg-lighter pe-2 col-form-label text-sm-end">단속조</label>
+			<select id="teamNm--${pageName}" name="teamNm" data-map="TEAM_NM" class="form-select">
+			</select>
+		</div>
+		<div class="col-md-12 pvs bpv">
+			<label class="w-px-150 bg-lighter pe-2 col-form-label text-sm-end">단속원</label>
+			<input type="text" id="teamer1--${pageName}" name="teamer1" data-map="TEAMER_1" class="form-control" />
+			<input type="text" id="teamer2--${pageName}" name="teamer2" data-map="TEAMER_2" class="form-control" />
+			<input type="text" id="teamer3--${pageName}" name="teamer3" data-map="TEAMER_3" class="form-control" />
+			<input type="text" id="teamer4--${pageName}" name="teamer4" data-map="TEAMER_4" class="form-control" />
+		</div>
+		<div class="col-md-12 pvs">
+			<label for="crdnSpareaCd--${pageName}" class="w-px-150 bg-lighter pe-2 col-form-label text-sm-end">특별구역</label>
+			<select id="crdnSpareaCd--${pageName}" name="crdnSpareaCd" data-map="CRDN_SPAREA_CD" class="form-select">
+				<c:forEach items="${FIM007List}" var="item">
+					<option value="${item.code}">${item.value}</option>
+                </c:forEach>
+			</select>
+		</div>
+		<div class="col-md-12 pvs bpv">
+			<label for="crdnSeCd--${pageName}" class="w-px-150 bg-lighter pe-2 col-form-label text-sm-end">단속구분</label>
+			<select id="crdnSeCd--${pageName}" name="crdnSeCd" data-map="CRDN_SE_CD" class="form-select">
+				<c:forEach items="${FIM002List}" var="item">
+					<option value="${item.code}">${item.value}</option>
+                </c:forEach>
+			</select>
+		</div>
+		<div class="col-md-12 pvs bpv">
+			<label class="w-px-150 bg-lighter pe-2 col-form-label text-sm-end">차량구분</label>
+			<label class="w-px-150 bg-lighter pe-2 col-form-label text-sm-end">차종</label>
+		</div>
+	</template>
 </div>
 
 <script>
@@ -246,6 +294,11 @@ $(document).ready(function(){
 	/**************************************************************************
 	 * 초기화
 	 **************************************************************************/
+	var cssForTask = $("#taskSeCd--${pageName}").val().toLowerCase();
+	var content = document.getElementById("taskItem--${pageName}").content;
+	var taskItem = $(content).find("."+cssForTask);
+	$("#editByTask--${pageName}").html(taskItem);
+	
 	initDatepicker("frmEdit--${pageName}"); //달력 초기화
 
 	$("#frmEdit--${pageName}").find(".form-date").each(function(){