diff --git a/src/main/java/cokr/xit/fims/excl/service/bean/Excl01ServiceBean.java b/src/main/java/cokr/xit/fims/excl/service/bean/Excl01ServiceBean.java index 38268d46..e4eb0b4f 100644 --- a/src/main/java/cokr/xit/fims/excl/service/bean/Excl01ServiceBean.java +++ b/src/main/java/cokr/xit/fims/excl/service/bean/Excl01ServiceBean.java @@ -176,7 +176,7 @@ public class Excl01ServiceBean extends AbstractServiceBean implements Excl01Serv for (int iLoop = 0; iLoop < excl01.getLevyExclIDs().length; iLoop++) { levyExclID = excl01.getLevyExclIDs()[iLoop]; - // 부과제외(TB_LEVY_EXCL) 자료 조회 + // 부과제외(TB_LEVY_EXCL) + 단속(TB_CRDN) 자료 조회 infoCrdnSttsCd = excl01Bean.getLevyExclusionInfo(new Excl01Query().setLevyExclId(levyExclID)); // 단속 상태 이력(TB_CRDN_STTS_HSTRY) 대장에서 부과제외 자료 조회 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 949d8c41..dcbf4c29 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 @@ -589,9 +589,17 @@ $(document).ready(function(){ } $P.openLevyExclPop = (levyExclSeCd) => { - let info = $P.photoInspectionControl.dataset.getCurrent("item"); + let info; - // info 가 없다면.. return + if ($P.currentDisplay == "photoInspection") { + info = $P.photoInspectionControl.dataset.getCurrent("item"); + } else if ($P.currentDisplay == "sameVehicleInspection") { + info = $P.sameVehicleControl.sub.dataset.getCurrent("item"); + } else { + return; + } + + // 선택된 자료가 없다면.. return if (info == undefined || info == "") { return; } diff --git a/src/main/webapp/WEB-INF/jsp/fims/excl/excl01020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/excl/excl01020-info.jsp index fcfcd89b..fc98f22b 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/excl/excl01020-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/excl/excl01020-info.jsp @@ -12,22 +12,27 @@