From 49af96b07fae2e982b034891df6ea8919efe94a3 Mon Sep 17 00:00:00 2001
From: leebeomjun <leebj91@xit.co.kr>
Date: Wed, 5 Jul 2023 14:33:39 +0900
Subject: [PATCH] =?UTF-8?q?=ED=99=94=EB=A9=B4=EC=97=90=20=ED=91=9C?=
 =?UTF-8?q?=EC=8B=9C=EB=90=98=EB=8A=94=20=EC=98=81=EC=83=81=EB=A7=A4?=
 =?UTF-8?q?=EC=B2=B4=20=ED=95=AD=EB=AA=A9=20=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cokr/xit/fims/crdn/web/CmnCrdnController.java    | 4 ++++
 .../java/cokr/xit/fims/crdn/web/Crdn01Controller.java     | 1 -
 .../java/cokr/xit/fims/crdn/web/Crdn02Controller.java     | 1 -
 .../java/cokr/xit/fims/crdn/web/Crdn05Controller.java     | 1 -
 .../java/cokr/xit/fims/crdn/web/Crdn06Controller.java     | 1 -
 .../java/cokr/xit/fims/crdn/web/DpvCrdnController.java    | 7 +++++++
 .../java/cokr/xit/fims/sprt/web/CmnSprtController.java    | 1 +
 src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml | 4 ----
 src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01010-main.jsp  | 4 +---
 src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05030-info.jsp  | 8 --------
 src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp  | 4 +---
 src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06030-main.jsp  | 4 +---
 12 files changed, 15 insertions(+), 25 deletions(-)

diff --git a/src/main/java/cokr/xit/fims/crdn/web/CmnCrdnController.java b/src/main/java/cokr/xit/fims/crdn/web/CmnCrdnController.java
index a8121af6..c33b9471 100644
--- a/src/main/java/cokr/xit/fims/crdn/web/CmnCrdnController.java
+++ b/src/main/java/cokr/xit/fims/crdn/web/CmnCrdnController.java
@@ -13,6 +13,7 @@ import cokr.xit.base.code.CommonCode;
 public class CmnCrdnController {
 
 	@Controller
+	@RequestMapping(name="민원 관리", value="/crdn/crdn01")
 	class CmnCrdn01Controller extends Crdn01Controller {
 		/** 민원 접수 자료 메인화면을 연다.
 		 * @return fims/crdn/crdn01010-main
@@ -61,6 +62,7 @@ public class CmnCrdnController {
 	}
 
 	@Controller
+	@RequestMapping(name="민원 개별 등록", value="/crdn/crdn02")
 	class CmnCrdn02Controller extends Crdn02Controller {
 		/** 민원 개별 등록 메인화면을 연다.
 		 * @return fims/crdn/crdn02010-main
@@ -76,6 +78,7 @@ public class CmnCrdnController {
 	}
 
 	@Controller
+	@RequestMapping(name="단속 자료 등록", value="/crdn/crdn05")
 	class CmnCrdn05Controller extends Crdn05Controller {
 		/** 단속 자료 등록 메인화면을 연다.
 		 * @return fims/crdn/crdn05010-main
@@ -93,6 +96,7 @@ public class CmnCrdnController {
 	}
 
 	@Controller
+	@RequestMapping(name="단속 관리", value="/crdn/crdn06")
 	class CmnCrdn06Controller extends Crdn06Controller {
 		/** 단속 관리 메인화면을 연다.
 		 * @return fims/crdn/crdn06010-main
diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn01Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn01Controller.java
index 332f85db..ac8e6d29 100644
--- a/src/main/java/cokr/xit/fims/crdn/web/Crdn01Controller.java
+++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn01Controller.java
@@ -18,7 +18,6 @@ import cokr.xit.fims.crdn.service.bean.Crdn01ServiceBean;
  * {웹 컨텍스트}/crdn/crdn01 로 접근할 수 있다.
  * @author leebj
  */
-@RequestMapping(name="민원 관리", value="/crdn/crdn01")
 public class Crdn01Controller extends ApplicationController {
 
 	@Resource(name="crdn01Service")
diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn02Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn02Controller.java
index bbdfad51..de6ee817 100644
--- a/src/main/java/cokr/xit/fims/crdn/web/Crdn02Controller.java
+++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn02Controller.java
@@ -12,7 +12,6 @@ import cokr.xit.fims.crdn.service.Crdn02Service;
  * {웹 컨텍스트}/crdn/crdn02 로 접근할 수 있다.
  * @author leebj
  */
-@RequestMapping(name="민원 개별 등록", value="/crdn/crdn02")
 public class Crdn02Controller extends ApplicationController {
 
 	@Resource(name="crdn02Service")
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 66a69882..c50fc461 100644
--- a/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java
+++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java
@@ -16,7 +16,6 @@ import cokr.xit.fims.crdn.service.Crdn05Service;
  * {웹 컨텍스트}/crdn/crdn05 로 접근할 수 있다.
  * @author leebj
  */
-@RequestMapping(name="단속 자료 등록", value="/crdn/crdn05")
 public class Crdn05Controller extends ApplicationController {
 
 	@Resource(name="crdn05Service")
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 1c5bce31..16098417 100644
--- a/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java
+++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java
@@ -17,7 +17,6 @@ import cokr.xit.fims.crdn.service.Crdn06Service;
  * {웹 컨텍스트}/crdn/crdn06 로 접근할 수 있다.
  * @author leebj
  */
-@RequestMapping(name="단속 관리", value="/crdn/crdn06")
 public class Crdn06Controller extends ApplicationController {
 
 	@Resource(name="crdn06Service")
diff --git a/src/main/java/cokr/xit/fims/crdn/web/DpvCrdnController.java b/src/main/java/cokr/xit/fims/crdn/web/DpvCrdnController.java
index e700708a..0d5483f4 100644
--- a/src/main/java/cokr/xit/fims/crdn/web/DpvCrdnController.java
+++ b/src/main/java/cokr/xit/fims/crdn/web/DpvCrdnController.java
@@ -35,6 +35,13 @@ public class DpvCrdnController {
 	@RequestMapping(name="장애인과태료업무 단속등록업무", value="/DPV/crdn/crdn05")
 	class DpvCrdn05Controller extends Crdn05Controller {
 
+		public ModelAndView getManualRegistrationScreen() {
+			ModelAndView mav = super.getManualRegistrationScreen();
+			Map<String, List<CommonCode>> commonCodes = getCodesOf("FIM006");
+			mav.addObject("FIM006List", commonCodes.get("FIM006"));
+			return mav;
+		}
+
 	}
 
 	@Controller
diff --git a/src/main/java/cokr/xit/fims/sprt/web/CmnSprtController.java b/src/main/java/cokr/xit/fims/sprt/web/CmnSprtController.java
index 1e3db3fe..86dce2a7 100644
--- a/src/main/java/cokr/xit/fims/sprt/web/CmnSprtController.java
+++ b/src/main/java/cokr/xit/fims/sprt/web/CmnSprtController.java
@@ -8,6 +8,7 @@ import org.springframework.web.servlet.ModelAndView;
 public class CmnSprtController {
 
 	@Controller
+	@RequestMapping(name="업무지원", value="/sprt/sprt01")
 	class CmnSprt01Controller extends Sprt01Controller {
 
 		/** 통합조회 메인화면을 연다.
diff --git a/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml b/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml
index 62ad4afe..55e35a0f 100644
--- a/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml
@@ -363,7 +363,6 @@ SELECT C.CRDN_ID                                      <!-- 단속 ID -->
 	   IF(TI.TEAMER_3 != '', TI.TEAMER_3,
 	   TI.TEAMER_4)))) AS APLCNT_CRDN_NM              <!-- 신고/단속자 -->
      , C.FFNLG_AMT                                    <!-- 잔액 -->
-     <!-- 영상매체 -->
      , C.ATCH_FILE_CNT                                <!-- 사진건수 -->
      , C.CRDN_SN                                      <!-- 단속 일련번호 -->
      , C.CRDN_STTS_CD                                 <!-- 단속 상태 코드 -->
@@ -396,9 +395,6 @@ AND IF(CC.CVLCPT_APLCNT_NM != '', CC.CVLCPT_APLCNT_NM,
 		</when>
 		<when test="by == 'ffnlgAmt'">
 AND C.FFNLG_AMT = REPLACE(#{term},',','')
-		</when>
-		<when test="by == '영상매체'">
-
 		</when>
 		<when test="by == 'atchFileCnt'">
 AND C.ATCH_FILE_CNT = #{term}
diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01010-main.jsp
index 4456f9b8..6a1c39c6 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01010-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01010-main.jsp
@@ -82,7 +82,6 @@
 											<th width="80">접수일자</th>
 											<th width="80">처리기한</th>
 											<th width="80">위반일자</th>
-											<th width="80">첨부매체</th>
 											<th width="80">사진건수</th>
 											<th width="80">위반내용</th>
 											<th width="80">접수번호</th>
@@ -100,7 +99,6 @@
 				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{CVLCPT_RCPT_YMD}</td>
 				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{CVLCPT_PRCS_PRNMNT_DT}</td>
 				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{CRDN_YMD_TM}</td>
-				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{첨부매체}</td>
 				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{ATCH_FILE_CNT}</td>
 				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{위반내용}</td>
 				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{CVLCPT_RCPT_NO}</td>
@@ -109,7 +107,7 @@
 									</template>
 									<template id="crdnNotFound--${pageName}">
 										<tr>
-											<td valign="top" colspan="13" class="dataTables_empty text-center">민원 정보를 찾지 못했습니다.</td>
+											<td valign="top" colspan="12" class="dataTables_empty text-center">민원 정보를 찾지 못했습니다.</td>
 										</tr>
 									</template>
 								</table>
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 e3461ae9..9d761da3 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
@@ -22,14 +22,6 @@
 			</label>
 			<input type="text" name="vhrno" data-map="VHRNO" class="form-control" required />
 		</div>
-		<div class="col-md-6">
-			<label class="w-px-150 col-form-label text-sm-end" for="">
-				영상매체
-			</label>
-			<select name="" class="form-select">
-
-			</select>
-		</div>
 		<div class="col-md-12">
 			<label class="w-px-150 col-form-label text-sm-end" for="vltnId">
 				위반내용
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 399ab8f1..7346a928 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
@@ -154,7 +154,6 @@
 											<th width="80">신고/단속자</th>
 											<th width="80">위반장소</th>
 											<th width="80">체납액</th>
-											<th width="80">영상매체</th>
 											<th width="80">사진건수</th>
 											<th width="80">발행번호</th>
 											<th width="80">차량확인</th>
@@ -210,7 +209,6 @@
 				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{APLCNT_CRDN_NM}</td>
 				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{CRDN_PLC}</td>
 				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-end">{체납액}</td>
-				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{영상매체}</td>
 				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{ATCH_FILE_CNT}</td>
 				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{CRDN_SN}</td>
 				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{차량확인}</td>
@@ -259,7 +257,7 @@
 									</template>
 									<template id="crdnNotFound--${pageName}">
 										<tr class="dpv eca">
-											<td valign="top" colspan="15" class="dataTables_empty text-center">단속 정보를 찾지 못했습니다.</td>
+											<td valign="top" colspan="14" class="dataTables_empty text-center">단속 정보를 찾지 못했습니다.</td>
 										</tr>
 										<tr class="pvs bpv">
 											<td valign="top" colspan="35" class="dataTables_empty text-center">단속 정보를 찾지 못했습니다.</td>
diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06030-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06030-main.jsp
index 88c002ff..4aa30b33 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06030-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06030-main.jsp
@@ -65,7 +65,6 @@
 											<th width="80" onclick="searchFromGridTitle('by--${pageName}','byOutput--${pageName}','CRDN_STDG_NM',this.innerText);">법정동</th>
 											<th width="80" onclick="searchFromGridTitle('by--${pageName}','byOutput--${pageName}','APLCNT_CRDN_NM',this.innerText);">신고/단속자</th>
 											<th width="80" onclick="searchFromGridTitle('by--${pageName}','byOutput--${pageName}','FFNLG_AMT',this.innerText);">잔액</th>
-											<th width="80" onclick="searchFromGridTitle('by--${pageName}','byOutput--${pageName}','',this.innerText);">영상매체</th>
 											<th width="80" onclick="searchFromGridTitle('by--${pageName}','byOutput--${pageName}','ATCH_FILE_CNT',this.innerText);">사진건수</th>
 											<th width="80" onclick="searchFromGridTitle('by--${pageName}','byOutput--${pageName}','CRDN_SN',this.innerText);">발행번호</th>
 											<th width="80">표지확인</th>
@@ -83,7 +82,6 @@
 				                    		<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">{FFNLG_AMT}</td>
-				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{매체}</td>
 				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-end">{ATCH_FILE_CNT}</td>
 				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-end">{CRDN_SN}</td>
 				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center"><input type="checkbox" disabled="disabled" /></td>
@@ -92,7 +90,7 @@
 									</template>
 									<template id="crdnNotFound--${pageName}">
 										<tr>
-			                    			<td valign="top" colspan="12" class="dataTables_empty text-center">단속 정보를 찾지 못했습니다.</td>
+			                    			<td valign="top" colspan="11" class="dataTables_empty text-center">단속 정보를 찾지 못했습니다.</td>
 			                    		</tr>
 									</template>
 								</table>