From 5e50c69e81d1302a7a426e39fb8cca4bdc01365b Mon Sep 17 00:00:00 2001
From: leebeomjun <leebj91@xit.co.kr>
Date: Wed, 5 Jul 2023 16:49:42 +0900
Subject: [PATCH] =?UTF-8?q?=EB=AF=BC=EC=9B=90=EB=8B=B5=EB=B3=80=EB=8C=80?=
 =?UTF-8?q?=EC=83=81=EC=9E=90=EB=A3=8C=20=ED=99=94=EB=A9=B4=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cokr/xit/fims/crdn/web/Crdn01Controller.java     | 3 ++-
 src/main/resources/sql/mapper/fims/crdn/crdn01-mapper.xml | 5 +++--
 src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01030-main.jsp  | 8 +++++---
 src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05030-info.jsp  | 2 +-
 4 files changed, 11 insertions(+), 7 deletions(-)

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 ed435a41..be5562b2 100644
--- a/src/main/java/cokr/xit/fims/crdn/web/Crdn01Controller.java
+++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn01Controller.java
@@ -45,8 +45,9 @@ public class Crdn01Controller extends ApplicationController {
 		mav.setViewName("fims/crdn/crdn01030-main");
 		mav.addObject("pageName", "crdn01030-main");
 
-		Map<String, List<CommonCode>> commonCodes = getCodesOf("FIM026", "FIM054");
+		Map<String, List<CommonCode>> commonCodes = getCodesOf("FIM022", "FIM026", "FIM054");
 		mav.addObject("FIM054List", commonCodes.get("FIM054"));
+		addCodes(commonCodes, mav, "FIM022");
 		addCodes(commonCodes, mav, "FIM026");
 		return mav;
 	}
diff --git a/src/main/resources/sql/mapper/fims/crdn/crdn01-mapper.xml b/src/main/resources/sql/mapper/fims/crdn/crdn01-mapper.xml
index 2e4dbc94..47261e55 100644
--- a/src/main/resources/sql/mapper/fims/crdn/crdn01-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/crdn/crdn01-mapper.xml
@@ -194,10 +194,11 @@ SELECT C.CRDN_ID                                      <!-- 단속 ID -->
      , CONCAT(C.CRDN_YMD,'',C.CRDN_TM) AS CRDN_YMD_TM <!-- 단속 일시 -->
      , CC.CVLCPT_RCPT_NO        <!-- 민원 접수 번호 -->
      , C.VHRNO                 <!-- 차량번호 -->
-     <!-- 서손/계도사유 -->
-     <!-- 특기사항 -->
+     , LE.LEVY_EXCL_RSN_CD
+     , C.ETC_CN
   FROM TB_CRDN C
   INNER JOIN TB_CRDN_CVLCPT CC ON (C.CRDN_ID = CC.CRDN_ID)
+  LEFT OUTER JOIN TB_LEVY_EXCL LE ON (C.CRDN_ID = LE.CRDN_ID)
  WHERE C.DEL_YN = 'N'
    AND C.TASK_SE_CD = #{taskSeCd}
 <if test="by != null and by != '' and term != null">
diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01030-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01030-main.jsp
index 51ee8df9..9fdb5da5 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01030-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01030-main.jsp
@@ -105,8 +105,8 @@
 				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{CRDN_YMD_TM}</td>
 				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{CVLCPT_RCPT_NO}</td>
 				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{VHRNO}</td>
-				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{서손/계도사유}</td>
-				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{특기사항}</td>
+				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{LEVY_EXCL_RSN_CD}</td>
+				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{ETC_CN}</td>
 				                    	</tr>
 									</template>
 									<template id="crdnNotFound--${pageName}">
@@ -135,6 +135,7 @@
 /**************************************************************************
  * Global Variable
  **************************************************************************/
+var FIM022 = new CommonCodes(${FIM022});
 var FIM026 = new CommonCodes(${FIM026});
 pageObject["${pageName}"] = {};
 
@@ -150,7 +151,8 @@ $(document).ready(function(){
 	    	CRDN_REG_SE_CD 			: FIM026,
 	    	CVLCPT_RCPT_YMD 		: dateFormat,
 	    	CVLCPT_PRCS_PRNMNT_DT 	: datetimeFormat,
-	    	CRDN_YMD_TM 			: datetimeFormat
+	    	CRDN_YMD_TM 			: datetimeFormat,
+	    	LEVY_EXCL_RSN_CD 		: FIM022
 		}
 	});
 
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 aef73f35..8e426d6e 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
@@ -113,7 +113,7 @@
 		<div class="col-md-6">
 			<label class="w-px-150 col-form-label text-sm-end" for="zip">우편번호</label>
 			<input type="text" name="zip" data-map="ZIP" class="form-control w-px-100" />
-
+			<button type="button" class="btn btn-sm btn-outline-dark">검색</button>
 		</div>
 		<div class="col-md-6">
 			차량명칭/차량색상은 입력항목이 아닙니다.