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> commonCodes = getCodesOf("FIM026", "FIM054"); + Map> 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 , 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} 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 @@ {CRDN_YMD_TM} {CVLCPT_RCPT_NO} {VHRNO} - {서손/계도사유} - {특기사항} + {LEVY_EXCL_RSN_CD} + {ETC_CN}