메뉴관련css 수정, 단속관리 화면 수정

src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java

@@ -28,12 +28,12 @@ public class Crdn06Controller extends ApplicationController {
 		mav.setViewName("fims/crdn/crdn06010-main");
 		mav.addObject("pageName", "crdn06010-main");
 
-		Map<String, List<CommonCode>> commonCodes = getCodesOf("FIM002", "FIM003", "FIM005", "FIM010", "FIM026", "FIM054");
+		Map<String, List<CommonCode>> commonCodes = getCodesOf("FIM002", "FIM003", "FIM005", "FIM010", "FIM022", "FIM026", "FIM054");
 		mav.addObject("FIM003List", commonCodes.get("FIM003"));
 		mav.addObject("FIM005List", commonCodes.get("FIM005"));
 		mav.addObject("FIM010List", commonCodes.get("FIM010"));
 		mav.addObject("FIM054List", commonCodes.get("FIM054"));
-		addCodes(commonCodes, mav, "FIM002", "FIM003", "FIM010", "FIM026");
+		addCodes(commonCodes, mav, "FIM002", "FIM003", "FIM010", "FIM022", "FIM026");
 		return mav;
 	}
 

src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml

@@ -110,6 +110,11 @@ SELECT C.CRDN_ID               <!-- 단속 ID -->
      , C.CRDN_YMD              <!-- 단속 일자 -->
      , C.CRDN_TM               <!-- 단속 시각 -->
      , CONCAT(C.CRDN_YMD,'',C.CRDN_TM) AS CRDN_YMD_TM <!-- 단속 일시 -->
+     , IF(CC.CVLCPT_APLCNT_NM != '', CC.CVLCPT_APLCNT_NM,
+	   IF(TI.TEAMER_1 != '', TI.TEAMER_1,
+	   IF(TI.TEAMER_2 != '', TI.TEAMER_2,
+	   IF(TI.TEAMER_3 != '', TI.TEAMER_3,
+	   TI.TEAMER_4)))) AS APLCNT_CRDN_NM              <!-- 신고/단속자 -->
      , C.VHRNO                 <!-- 차량번호 -->
      , C.CRDN_STDG_NM          <!-- 단속 법정동 명 -->
      , C.CRDN_ROAD_NM          <!-- 단속 도로 명 -->
@@ -183,6 +188,9 @@ SELECT C.CRDN_ID               <!-- 단속 ID -->
      , CC.CVLCPT_TRSM_DT        <!-- 민원 전송 일시 -->
      , CC.CVLCPT_TRSM_CD        <!-- 민원 전송 코드 -->
      , CC.CVLCPT_TRSM_MSG       <!-- 민원 전송 메시지 -->
+     , LE.LEVY_EXCL_RSN_CD      <!-- 부과 제외 사유 코드 -->
+     , LE.LEVY_EXCL_YMD         <!-- 부과 제외 일자 -->
+     , LE.ETC_CN AS LEVY_EXCL_ETC_CN <!-- 부과 제외 기타 내용 -->
      , C.DEL_YN
      , C.RGTR
 	 , C.REG_DT
@@ -193,6 +201,9 @@ SELECT C.CRDN_ID               <!-- 단속 ID -->
      , C.DEL_RSN
 FROM TB_CRDN C
 LEFT OUTER JOIN TB_CRDN_CVLCPT CC ON (C.CRDN_ID = CC.CRDN_ID)
+LEFT OUTER JOIN TB_TEAM_INFO TI ON (C.TEAM_ID = TI.TEAM_ID)
+LEFT OUTER JOIN TB_LEVY_EXCL LE ON (C.CRDN_ID = LE.CRDN_ID)
+LEFT OUTER JOIN TB_LEVY L ON (C.LEVY_ID = L.LEVY_ID)
 WHERE C.DEL_YN = 'N'
 <if test="by != null and by != '' and term != null">
 	<choose>
@@ -245,7 +256,7 @@ SELECT C.CRDN_ID                                      <!-- 단속 ID -->
      , C.CRDN_PLC
      , C.ATCH_FILE_CNT                                <!-- 사진건수 -->
      , C.CRDN_STTS_CD                                 <!-- 단속 상태 코드 -->
-     <!-- 원금액 -->
+     , C.FFNLG_AMT                                    <!-- 원금액 -->
 	 <!-- 감경금액 -->
      , C.CRDN_INPT_SE_CD                              <!-- 자료출처 -->
   FROM TB_CRDN C

src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp

@@ -209,15 +209,15 @@
 				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{CRDN_YMD_TM}</td>
 				                    		<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-center">{체납액}</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>
 				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{CRDN_STTS_CD}</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">{제외처리일자}</td>
+				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{LEVY_EXCL_YMD}</td>
-				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{제외내역}</td>
+				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{LEVY_EXCL_ETC_CN}</td>
 				                    	</tr>
 				                    	<tr class="pvs bpv">
 											<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-end">{ROW_NUM}</td>
@@ -289,6 +289,7 @@
 var FIM002 = new CommonCodes(${FIM002});
 var FIM003 = new CommonCodes(${FIM003});
 var FIM010 = new CommonCodes(${FIM010});
+var FIM022 = new CommonCodes(${FIM022});
 var FIM026 = new CommonCodes(${FIM026});
 pageObject["${pageName}"] = {};
 
@@ -317,7 +318,9 @@ $(document).ready(function(){
 
 	    	CRDN_SE_CD: FIM002,
 	    	CRDN_STTS_CD 	: FIM010,
-	    	CRDN_REG_SE_CD: FIM026
+	    	CRDN_REG_SE_CD: FIM026,
+	    	LEVY_EXCL_YMD : dateFormat,
+	    	LEVY_EXCL_RSN_CD : FIM022
 		},
 	    keymapper:info => info ? info.CRDN_ID : "",
 	    dataGetter:obj => obj.crdnList,

src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-main.jsp

@@ -181,7 +181,7 @@
 											<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-start">{CRDN_PLC}</td>
 											<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{ATCH_FILE_CNT}</td>
 											<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{CRDN_STTS_CD}</td>
-											<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-end">{unknown}</td>
+											<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-end">{FFNLG_AMT}</td>
 											<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-end">{unknown}</td>
 											<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{CRDN_INPT_SE_CD}</td>
 										</tr>
@@ -370,8 +370,9 @@ $(document).ready(function(){
 	    formats: {
 	    	CRDN_YMD_TM 	: datetimeFormat,
 	    	CRDN_INPT_SE_CD : FIM003,
-	    	CRDN_STTS_CD 	: FIM010
+	    	CRDN_STTS_CD 	: FIM010,
-	    	//금액,금액
+	    	FFNLG_AMT 		: numberFormat
+			//감경금액
 	    	//검사결과,처리방법
 		}
 	});

src/main/webapp/resources/css/fims/framework/common/xit-core.css

@@ -16019,7 +16019,7 @@ html:not(.layout-menu-fixed) .menu-inner-shadow {
     flex: none;
 }
 .menu-vertical .menu-sub .menu-link {
-    padding-left: 3rem;
+    padding-left: 2rem;
 }
 .menu-vertical .menu-sub .menu-sub .menu-link {
     padding-left: 3.65rem;