diff --git a/src/main/java/cokr/xit/fims/crdn/service/bean/ImportServiceBean.java b/src/main/java/cokr/xit/fims/crdn/service/bean/ImportServiceBean.java index 35e16fbd..874bc625 100644 --- a/src/main/java/cokr/xit/fims/crdn/service/bean/ImportServiceBean.java +++ b/src/main/java/cokr/xit/fims/crdn/service/bean/ImportServiceBean.java @@ -91,7 +91,8 @@ public class ImportServiceBean extends AbstractServiceBean implements ImportServ String taskSeCd = processInfo.get("taskSeCd"); String orgID = currentUser().getOrgID(); String fileGroupType = processInfo.get("fileGroupType"); - boolean statByTeamEquipment = TaskProcessor.get().statByTeamEquipment(taskSeCd); + boolean statByTeamEquipment = TaskProcessor.get().statByTeamEquipment(taskSeCd), + excludeExempted = "true".equals(processInfo.get("excludeExempted")); HashMap resultMap = new HashMap<>(); List crdnList = divideFiles(fileList).stream() @@ -173,7 +174,7 @@ public class ImportServiceBean extends AbstractServiceBean implements ImportServ //3.등록 crdnList.forEach(info -> { Crdn crdn = (Crdn)info.get("crdn"); - if (exempted.contains(crdn.getVhrno())) + if (exempted.contains(crdn.getVhrno()) && excludeExempted) crdn.setCrdnSttsCd("81"); // 면제차량 boolean saved = crdnBean.create(null, crdn, (List)info.get("fileInfos")); resultMap.put("saved", saved); diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java index ed0e61a1..0f504172 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java @@ -355,6 +355,8 @@ public class Crdn05Controller extends ApplicationController { HashMap processInfo = new HashMap<>(); processInfo.put("institute", currentUser().getInstitute()); processInfo.put("taskSeCd", taskSeCd); + processInfo.put("excludeExempted", hreq.getParameter("doExempt")); + Map parsers = Map.of( "TXT", new AttachedTxtParser(), "JPG", new OnlyImageParser(),