From 7793a856918c6985e7aefa952a93e0c44375b18a Mon Sep 17 00:00:00 2001 From: mjkhan21 Date: Mon, 30 Jun 2025 02:03:07 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B6=80=EA=B3=BC=EC=A0=9C=EC=99=B8/=EA=B3=84?= =?UTF-8?q?=EB=8F=84=EC=B2=98=EB=A6=AC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cokr/xit/fims/chongno/ChongnoTaskProcessor.java | 12 ++++++++---- .../webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp | 4 ++-- .../webapp/WEB-INF/jsp/fims/crdn/crdn06020-info.jsp | 2 +- 데이터 수정사항.txt | 8 ++------ 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/main/java/cokr/xit/fims/chongno/ChongnoTaskProcessor.java b/src/main/java/cokr/xit/fims/chongno/ChongnoTaskProcessor.java index 96270eb..62af2ae 100644 --- a/src/main/java/cokr/xit/fims/chongno/ChongnoTaskProcessor.java +++ b/src/main/java/cokr/xit/fims/chongno/ChongnoTaskProcessor.java @@ -118,10 +118,12 @@ public class ChongnoTaskProcessor extends TaskProcessor { if (excluded.containsKey(crdn)) continue; int vhclCpct = crdn.getVhclCpct(); - if (vhclCpct == 0) {// 정원미확인 -// excluded.put(crdn, newLevyExcl(crdn, "1", "115")); + if (vhclCpct == 0) { + // 정원미확인 -> 초기상태 } else if (vhclCpct < capacity) // 정원미만 excluded.put(crdn, newLevyExcl(crdn, "1", "114")); + else if (vhclCpct >= capacity) // 정원초과 -> 계도(시범운영) + excluded.put(crdn, newLevyExcl(crdn, "2", "206")); } return excluded; @@ -131,7 +133,7 @@ public class ChongnoTaskProcessor extends TaskProcessor { public LevyExcl getLevyExcl(Crdn crdn) { LevyExcl excl = super.getLevyExcl(crdn); if (!TASK_SE_CD.equals(crdn.getTaskSeCd())) - return excl; + return excl; if (excl != null) return excl; @@ -143,11 +145,13 @@ public class ChongnoTaskProcessor extends TaskProcessor { return null; int vhclCpct = crdn.getVhclCpct(); - if (vhclCpct == 0) // 정원미확인 + if (vhclCpct == 0) // 정원미확인 -> 초기상태 return null; //newLevyExcl(crdn, "1", "115"); if (vhclCpct < capacity) // 정원미만 return newLevyExcl(crdn, "1", "114"); + if (vhclCpct >= capacity) // 정원초과 -> 계도(시범운영) + return newLevyExcl(crdn, "2", "206"); return null; } 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 3eb7179..8437159 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 @@ -310,13 +310,13 @@ $(document).ready(function(){ $('button[name^="btnVehicle"]').prop("disabled", initial < 1); $('span[name="crdnSummary"]').html(crdns.length > 0 ? "초기상태: " + initial + ", 부과제외: " + excluded : ""); }; - +<%-- ctrl.dataset.onSort = sorter => { var t = $P.getGridTemplate(); var trs = Apply.fromDataset.getTbody(ctrl.dataset, t.found, t.notFound, t.replacer); $P.renderCrdnList(obj["Paging"]?.totalSize, ctrl.dataset.length, trs, option); }; - +--%> ctrl.dataset.onCurrentChange = (dataItem) => { Apply.fromDataset.currentRow(ctrl.dataset, dataItem, $P.findn("crdnTbody")); } diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-info.jsp index 3f1f1ee..afeeec6 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-info.jsp @@ -387,5 +387,5 @@ // 3. Dataset 설정 $P.ctrl.setData([${Info}]); }); - +//# sourceURL=crdn06020-info.jsp diff --git a/데이터 수정사항.txt b/데이터 수정사항.txt index 595dbf0..0f7bea9 100644 --- a/데이터 수정사항.txt +++ b/데이터 수정사항.txt @@ -1,7 +1,5 @@ ===== 2025-06-26 ===== -DELETE FROM TB_EXMPTN_VHCL; - INSERT INTO TB_EXMPTN_VHCL (EXMPTN_VHCL_ID, SGG_CD, VHRNO, EXMPTN_RSN, EXMPTN_BGNG_YMD, EXMPTN_END_YMD, DEL_YN, REG_DT, RGTR, MDFCN_DT, MDFR) SELECT EXMPTN_VHCL_ID, SGG_CD, VHRNO, EXMPTN_RSN, YMD_BGN EXMPTN_BGNG_YMD, YMD_END EXMPTN_END_YMD, 'N' DEL_YN, NOW REG_DT, USER_ID RGTR, NOW MDFCN_DT, USER_ID MDFR FROM ( @@ -17,12 +15,10 @@ SELECT EXMPTN_VHCL_ID, SGG_CD, VHRNO, EXMPTN_RSN, YMD_BGN EXMPTN_BGNG_YMD, YMD_E SELECT '0000000010' EXMPTN_VHCL_ID, '서울70사5534' VHRNO FROM DUAL ) A, ( - SELECT '11110' SGG_CD, '0000000070' USER_ID, '마을버스' EXMPTN_RSN, '20250701' YMD_BGN, '99991231' YMD_END, '20250624000001' NOW + SELECT '11110' SGG_CD, '0000000070' USER_ID, '마을버스' EXMPTN_RSN, '20250601' YMD_BGN, '99991231' YMD_END, '20250624000001' NOW FROM DUAL ) B; -DELETE FROM TB_EXMPTN_VHCL_HSTRY; - INSERT INTO TB_EXMPTN_VHCL_HSTRY (EXMPTN_VHCL_ID, HSTRY_SN, SGG_CD, VHRNO, EXMPTN_RSN, EXMPTN_BGNG_YMD, EXMPTN_END_YMD, DEL_YN, REG_DT, RGTR, MDFCN_DT, MDFR) SELECT EXMPTN_VHCL_ID, HSTRY_SN, SGG_CD, VHRNO, EXMPTN_RSN, YMD_BGN EXMPTN_BGNG_YMD, YMD_END EXMPTN_END_YMD, 'N' DEL_YN, NOW REG_DT, USER_ID RGTR, NOW MDFCN_DT, USER_ID MDFR FROM ( @@ -38,7 +34,7 @@ FROM ( SELECT '0000000010' EXMPTN_VHCL_ID, '서울70사5534' VHRNO FROM DUAL ) A, ( - SELECT '11110' SGG_CD, '0000000070' USER_ID, '마을버스' EXMPTN_RSN, '20250701' YMD_BGN, '99991231' YMD_END, '20250624000001' NOW, '00001' HSTRY_SN + SELECT '11110' SGG_CD, '0000000070' USER_ID, '마을버스' EXMPTN_RSN, '20250601' YMD_BGN, '99991231' YMD_END, '20250624000001' NOW, '00001' HSTRY_SN FROM DUAL ) B;