From 25398fda2d5665c5ba581ee80146728253d7f2ef Mon Sep 17 00:00:00 2001 From: mjkhan21 Date: Thu, 8 May 2025 17:34:49 +0900 Subject: [PATCH] =?UTF-8?q?=EB=8B=A8=EC=86=8D=ED=8C=8C=EC=9D=BC=20?= =?UTF-8?q?=EB=93=B1=EB=A1=9D=20=EC=8B=9C=20=EB=A9=B4=EC=A0=9C=EC=B0=A8?= =?UTF-8?q?=EB=9F=89=20=EB=B6=80=EA=B3=BC=EC=A0=9C=EC=99=B8=20=EC=98=B5?= =?UTF-8?q?=EC=85=98=20=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cokr/xit/fims/crdn/service/bean/ImportServiceBean.java | 5 +++-- src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) 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(),