diff --git a/src/main/java/cokr/xit/fims/chongno/ChongnoTaskProcessor.java b/src/main/java/cokr/xit/fims/chongno/ChongnoTaskProcessor.java index 52bf4d3..454ba2b 100644 --- a/src/main/java/cokr/xit/fims/chongno/ChongnoTaskProcessor.java +++ b/src/main/java/cokr/xit/fims/chongno/ChongnoTaskProcessor.java @@ -127,42 +127,12 @@ public class ChongnoTaskProcessor extends TaskProcessor { LevyExcl levyExcl = getLevyExcl(capacity, vhrno, crdn); if (levyExcl != null) excluded.put(crdn, levyExcl); // 정원초과 -> 계도(시범운영) - -/* - int vhclCpct = crdn.getVhclCpct(); - if (vhclCpct == 0) { - // 정원미확인 -> 초기상태 - } else if (vhclCpct < capacity) // 정원미만 - excluded.put(crdn, newLevyExcl(crdn, "1", "114")); - else if (vhclCpct >= capacity) { - boolean enforce = isTarget(vhrno, crdn); - if (enforce) { - excluded.put(crdn, newLevyExcl(crdn, "2", "206")); // 정원초과 -> 계도(시범운영) - } else - excluded.put(crdn, newLevyExcl(crdn, "1", "103")); // 부과제외(일반차량) - } -*/ } return excluded; } - /**차량이 승합차이고 일반 운수사업용인지 반환한다. - * @param vhrno Vhrno - * @param crdn 단속정보 - * @return 차량이 승합차이고 일반 운수사업용인지 여부 - private boolean isTarget(Vhrno vhrno, Crdn crdn) { - vhrno.setFullNumber(crdn.getVhrno()); - return Vhrno.VAN.equals(vhrno.getVehicleType()) - && vhrno.isCommercial(); - } - */ - private LevyExcl getLevyExcl(int capacity, Vhrno vhrno, Crdn crdn) { - int vhclCpct = crdn.getVhclCpct(); - if (vhclCpct == 0) // 정원미확인 -> 초기상태 - return null; //newLevyExcl(crdn, "1", "115"); - if (vhrno == null) vhrno = new Vhrno(); vhrno.setFullNumber(crdn.getVhrno()); @@ -171,11 +141,14 @@ public class ChongnoTaskProcessor extends TaskProcessor { boolean target = Vhrno.VAN.equals(vhrno.getVehicleType()) && vhrno.isCommercial(); - if (!target) return newLevyExcl(crdn, "1", "103"); // 부과제외(일반차량) - if (vhclCpct < capacity) // 정원미만 + int vhclCpct = crdn.getVhclCpct(); + if (vhclCpct == 0) // 정원미확인 -> 초기상태 + return null; //newLevyExcl(crdn, "1", "115"); + + if (vhclCpct < capacity) // 부과제외(정원미만) return newLevyExcl(crdn, "1", "114"); // 정원초과, 승합차, 운수사업 일반 -> 단속대상: 계도(시범운영) @@ -195,21 +168,5 @@ public class ChongnoTaskProcessor extends TaskProcessor { return capacity != 0 ? getLevyExcl(capacity, null, crdn) : null; -/* - int vhclCpct = crdn.getVhclCpct(); - if (vhclCpct == 0) // 정원미확인 -> 초기상태 - return null; //newLevyExcl(crdn, "1", "115"); - - boolean target = isTarget(new Vhrno(), crdn); - - if (vhclCpct < capacity) // 정원미만 - return newLevyExcl(crdn, "1", "114"); - - boolean enforce = vhclCpct >= capacity && target; - if (enforce) // 정원초과, 승합차, 운수사업 일반 -> 단속대상: 계도(시범운영) - return newLevyExcl(crdn, "2", "206"); - else - return newLevyExcl(crdn, "1", "103"); // 부과제외(일반차량) -*/ } } \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn-cctv.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn-cctv.jsp index 84957a7..da7264d 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn-cctv.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn-cctv.jsp @@ -162,7 +162,8 @@ let cctv = { normal: 0, malformed: 0, success: 0, - duplicates: 0 + duplicates: 0, + invalidPlace: 0 }, batches = getBatches(fileSet.getDataset(), keymapper); diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn-local.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn-local.jsp index f92655f..a0abf3d 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn-local.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn-local.jsp @@ -180,7 +180,8 @@ let localFiles = { normal: 0, malformed: 0, success: 0, - duplicates: 0 + duplicates: 0, + invalidPlace: 0 }, batches = getBatches(uploadSet.getDataset(), keymapper); diff --git a/src/main/webapp/WEB-INF/report/img/prenotice-01.jpg b/src/main/webapp/WEB-INF/report/img/prenotice-01.jpg new file mode 100644 index 0000000..4df937f Binary files /dev/null and b/src/main/webapp/WEB-INF/report/img/prenotice-01.jpg differ diff --git a/src/main/webapp/WEB-INF/report/img/prenotice-02.jpg b/src/main/webapp/WEB-INF/report/img/prenotice-02.jpg new file mode 100644 index 0000000..eebd8e3 Binary files /dev/null and b/src/main/webapp/WEB-INF/report/img/prenotice-02.jpg differ diff --git a/src/main/webapp/WEB-INF/report/img/prenotice-1.jpg b/src/main/webapp/WEB-INF/report/img/prenotice-1.jpg deleted file mode 100644 index 9258996..0000000 Binary files a/src/main/webapp/WEB-INF/report/img/prenotice-1.jpg and /dev/null differ diff --git a/src/main/webapp/WEB-INF/report/prenotice-a4.jasper b/src/main/webapp/WEB-INF/report/prenotice-a4.jasper index 0d90258..934dc44 100644 Binary files a/src/main/webapp/WEB-INF/report/prenotice-a4.jasper and b/src/main/webapp/WEB-INF/report/prenotice-a4.jasper differ diff --git a/src/main/webapp/WEB-INF/report/prenotice-a4.jrxml b/src/main/webapp/WEB-INF/report/prenotice-a4.jrxml index 5b2d3fa..71bab07 100644 --- a/src/main/webapp/WEB-INF/report/prenotice-a4.jrxml +++ b/src/main/webapp/WEB-INF/report/prenotice-a4.jrxml @@ -161,7 +161,7 @@ - + @@ -200,8 +200,9 @@ - + + @@ -254,8 +255,9 @@ - - + + + @@ -291,10 +293,11 @@ - - + + + - + @@ -354,7 +357,28 @@ + + + + + + + + + + + + + + + + + + + + +