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 17399bbf..8147ab1e 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java +++ b/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> commonCodes = getCodesOf("FIM002", "FIM003", "FIM005", "FIM010", "FIM026", "FIM054"); + Map> 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; } 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 2e9c72e4..d4321d0e 100644 --- a/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml +++ b/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml @@ -110,6 +110,11 @@ SELECT C.CRDN_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 , 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 , 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' @@ -245,7 +256,7 @@ SELECT C.CRDN_ID , C.CRDN_PLC , C.ATCH_FILE_CNT , C.CRDN_STTS_CD - + , C.FFNLG_AMT , C.CRDN_INPT_SE_CD FROM TB_CRDN C 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 c2e3a3aa..9b0e4675 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 @@ -209,15 +209,15 @@ {CRDN_YMD_TM} {APLCNT_CRDN_NM} {CRDN_PLC} - {체납액} + {체납액} {영상매체} {ATCH_FILE_CNT} {CRDN_SN} {차량확인} {CRDN_STTS_CD} - {제외사유} - {제외처리일자} - {제외내역} + {LEVY_EXCL_RSN_CD} + {LEVY_EXCL_YMD} + {LEVY_EXCL_ETC_CN} {ROW_NUM} @@ -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, diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-main.jsp index e0f523cf..7cc81394 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-main.jsp @@ -181,7 +181,7 @@ {CRDN_PLC} {ATCH_FILE_CNT} {CRDN_STTS_CD} - {unknown} + {FFNLG_AMT} {unknown} {CRDN_INPT_SE_CD} @@ -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 + //감경금액 //검사결과,처리방법 } }); diff --git a/src/main/webapp/resources/css/fims/framework/common/xit-core.css b/src/main/webapp/resources/css/fims/framework/common/xit-core.css index 43f220d1..fc260d23 100644 --- a/src/main/webapp/resources/css/fims/framework/common/xit-core.css +++ b/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;