단속등록 화면 수정

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<Crdn, LevyExcl> getExcluded(List<Crdn> crdns) {
+		Map<Crdn, LevyExcl> 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");

src/main/webapp/WEB-INF/jsp/fims/crdn/crdn-cctv.jsp

@@ -145,6 +145,24 @@ $C.createCrdn = () => {
 					dirs: dir
 				},
 				success : (resp) => {
+					let content = "<ul>" + [
+						"업로드 파일수: " + resp.received,
+						"분류 건수: " + resp.divided,
+						"정상: " + resp.normal,
+						"메타파일 누락: " + resp.malformed,
+						"",
+						"등록 단속건수: " + resp.success,
+						"중복 단속건수: " + resp.duplicates
+					]
+					.map(str => "<li>" + str + "</li>")
+					.join("") + "</ul>";
+					dialog.alert({
+						content: content,
+						onOK: () => {},
+						onClose: () => $C.getFiles(dir)
+					});
+					
+					return;
 					if (resp.saved) {
 						$C.getFiles(dir);
 			        	if(resp.alertMessage)

src/main/webapp/WEB-INF/jsp/fims/crdn/crdn-local.jsp

@@ -161,6 +161,24 @@ $L.createCrdn = () =>
 			uploadFiles: uploadSet.getDataset()
 		},
 		success : (resp) => {
+					let content = "<ul>" + [
+						"업로드 파일수: " + resp.received,
+						"분류 건수: " + resp.divided,
+						"정상: " + resp.normal,
+						"메타파일 누락: " + resp.malformed,
+						"",
+						"등록 단속건수: " + resp.success,
+						"중복 단속건수: " + resp.duplicates
+					]
+					.map(str => "<li>" + str + "</li>")
+					.join("") + "</ul>";
+					dialog.alert({
+						content: content,
+						onOK: () => {},
+						onClose: () => uploadSet.clear()
+					});
+			
+			return;
 			if (resp.saved) {
 				uploadSet.setData([]);
 	        	if(resp.alertMessage)

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 += "<label class='mx-2'>";
+			tagsText += "<label class='mx-2 mt-1'>";
 			tagsText += "<input type='checkbox' name='newPhoto' class='form-check-input' value='"+item.id +"' ";
 			tagsText += " />";
 			tagsText += "<img src='"+ item.url +"' width='200' height='200' />";

src/main/webapp/WEB-INF/jsp/fims/crdn/crdn08010-main.jsp

@@ -50,7 +50,7 @@
 							<thead class="sticky-thead">
 								<tr name="exmptnVhclTheadTr">
 									<th style="width: 80px;">No.</th>
-									<th style="width: 100px;">차량번호</th>
+									<th style="width: 130px;">차량번호</th>
 									<th style="width: 200px;">사유</th>
 									<th style="width: 150px;">공문번호</th>
 									<th style="width: 150px;">소유주명</th>