diff --git a/src/main/java/cokr/xit/fims/chongno/ChongnoTaskProcessor.java b/src/main/java/cokr/xit/fims/chongno/ChongnoTaskProcessor.java index 282e7a4..96270eb 100644 --- a/src/main/java/cokr/xit/fims/chongno/ChongnoTaskProcessor.java +++ b/src/main/java/cokr/xit/fims/chongno/ChongnoTaskProcessor.java @@ -1,6 +1,7 @@ package cokr.xit.fims.chongno; import java.util.List; +import java.util.Map; import javax.annotation.Resource; @@ -99,6 +100,33 @@ public class ChongnoTaskProcessor extends TaskProcessor { private int capacity = -1; + @Override + public Map getExcluded(List crdns) { + Map excluded = super.getExcluded(crdns); + Crdn first = crdns.get(0); + if (!TASK_SE_CD.equals(first.getTaskSeCd())) + return excluded; + + if (capacity < 0) { + CommonCode code = codeMapper.getCode("FIM022", "114"); + capacity = toInt(notEmpty(code, "capacity").getEtc1()); + } + if (capacity == 0) + return excluded; + + for (Crdn crdn: crdns) { + if (excluded.containsKey(crdn)) continue; + + int vhclCpct = crdn.getVhclCpct(); + if (vhclCpct == 0) {// 정원미확인 +// excluded.put(crdn, newLevyExcl(crdn, "1", "115")); + } else if (vhclCpct < capacity) // 정원미만 + excluded.put(crdn, newLevyExcl(crdn, "1", "114")); + } + + return excluded; + } + @Override public LevyExcl getLevyExcl(Crdn crdn) { LevyExcl excl = super.getLevyExcl(crdn); @@ -116,7 +144,7 @@ public class ChongnoTaskProcessor extends TaskProcessor { int vhclCpct = crdn.getVhclCpct(); if (vhclCpct == 0) // 정원미확인 - return newLevyExcl(crdn, "1", "115"); + return null; //newLevyExcl(crdn, "1", "115"); if (vhclCpct < capacity) // 정원미만 return newLevyExcl(crdn, "1", "114"); 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 3f92985..4fbfeef 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 @@ -145,6 +145,24 @@ $C.createCrdn = () => { dirs: dir }, success : (resp) => { + let content = "
    " + [ + "업로드 파일수: " + resp.received, + "분류 건수: " + resp.divided, + "정상: " + resp.normal, + "메타파일 누락: " + resp.malformed, + "", + "등록 단속건수: " + resp.success, + "중복 단속건수: " + resp.duplicates + ] + .map(str => "
  • " + str + "
  • ") + .join("") + "
"; + dialog.alert({ + content: content, + onOK: () => {}, + onClose: () => $C.getFiles(dir) + }); + + return; if (resp.saved) { $C.getFiles(dir); if(resp.alertMessage) 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 0c4803a..f73fe62 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 @@ -161,6 +161,24 @@ $L.createCrdn = () => uploadFiles: uploadSet.getDataset() }, success : (resp) => { + let content = "
    " + [ + "업로드 파일수: " + resp.received, + "분류 건수: " + resp.divided, + "정상: " + resp.normal, + "메타파일 누락: " + resp.malformed, + "", + "등록 단속건수: " + resp.success, + "중복 단속건수: " + resp.duplicates + ] + .map(str => "
  • " + str + "
  • ") + .join("") + "
"; + dialog.alert({ + content: content, + onOK: () => {}, + onClose: () => uploadSet.clear() + }); + + return; if (resp.saved) { uploadSet.setData([]); if(resp.alertMessage) diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05030-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05030-info.jsp index c34be93..8185419 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05030-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05030-info.jsp @@ -417,7 +417,7 @@ $(document).ready(function(){ for(var index = 0; index < fileArr.length; index++){ var item = fileArr[index]; - tagsText += "