diff --git a/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnStngServiceBean.java b/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnStngServiceBean.java index 666f07e2..09a2061f 100644 --- a/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnStngServiceBean.java +++ b/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnStngServiceBean.java @@ -52,11 +52,11 @@ public class CrdnStngServiceBean extends AbstractServiceBean implements CrdnStng @Override public List getLinkFileLayoutMetadata(String sggCd, String taskSeCd, String instCd, String deptCd) { - CrdnQuery query = new CrdnQuery(); - query.setSggCd(sggCd); - query.setTaskSeCd(taskSeCd); - query.setInstCd(instCd); - query.setDeptCd(deptCd); + CrdnQuery query = new CrdnQuery() + .setSggCd(sggCd) + .setTaskSeCd(taskSeCd) + .setInstCd(instCd) + .setDeptCd(deptCd); return crdnEqpmntBean.getLinkFileLayoutMetadata(query); } @@ -98,37 +98,21 @@ public class CrdnStngServiceBean extends AbstractServiceBean implements CrdnStng @Override public String createExemptionVehicleInfo(ExmptnVhcl exmptnVhcl) { - boolean result = crdnStngBean.createExemptionVehicleInfo(exmptnVhcl); - if(result) { - return "[S]"; - } else { - return "[F]"; - } + return crdnStngBean.createExemptionVehicleInfo(exmptnVhcl) ? "[S]" : "[F]"; } @Override public String updateExemptionVehicleInfo(ExmptnVhcl exmptnVhcl) { - boolean result = crdnStngBean.updateExemptionVehicleInfo(exmptnVhcl); - if(result) { - return "[S]"; - } else { - return "[F]"; - } + return crdnStngBean.updateExemptionVehicleInfo(exmptnVhcl) ? "[S]" : "[F]"; } @Override public String removeExemptionVehicleInfo(ExmptnVhcl exmptnVhcl) { - boolean result = crdnStngBean.removeExemptionVehicleInfo(exmptnVhcl); - if(result) { - return "[S]"; - } else { - return "[F]"; - } + return crdnStngBean.removeExemptionVehicleInfo(exmptnVhcl) ? "[S]" : "[F]"; } @Override public List getExemptionVehicleHistoryList(String exmptnVhclId) { return crdnStngBean.getExemptionVehicleHistoryList(exmptnVhclId); } - -} +} \ No newline at end of file diff --git a/src/main/java/cokr/xit/fims/crdn/service/bean/ImportBean.java b/src/main/java/cokr/xit/fims/crdn/service/bean/ImportBean.java index 81b12b50..3039f9c5 100644 --- a/src/main/java/cokr/xit/fims/crdn/service/bean/ImportBean.java +++ b/src/main/java/cokr/xit/fims/crdn/service/bean/ImportBean.java @@ -201,12 +201,10 @@ public class ImportBean extends AbstractBean { * @param basicInfoMap */ private void setVehicleInfo(List crdns, BiFunction getCarModel) { - Map payerMap = new HashMap(); //행공센 연계 여부 if(ifEmpty(FimsConf.get().getPublicInfoCarYn(),() -> "Y").equals("Y")) { - List reqs = crdns.stream() .filter(crdn -> !isEmpty(crdn.getVhrno())) .map(crdn -> { @@ -219,14 +217,13 @@ public class ImportBean extends AbstractBean { for(BasicInfoExtRequest req : reqs) { Payer p = payerBean.getVehicleOwner(new BasicInfoExtRequest()); crdns.forEach(crdn -> { - if(req.getLevy_stdde().equals(crdn.getCrdnYmd()) - && req.getVhrno().equals(crdn.getVhrno()) + if (req.getLevy_stdde().equals(crdn.getCrdnYmd()) + && req.getVhrno().equals(crdn.getVhrno()) ) { payerMap.put(crdn.getCrdnYmd()+","+crdn.getVhrno(), p); } }); } - } else { List reqs = crdns.stream() .filter(crdn -> !isEmpty(crdn.getVhrno())) @@ -239,7 +236,6 @@ public class ImportBean extends AbstractBean { }).toList(); for(BasicInfoRequest req : reqs) { - Payer p = payerBean.getVehicleOwners(List.of(req)).get(0); crdns.forEach(crdn -> { if (req.getLevy_stdde().equals(crdn.getCrdnYmd()) 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 4a43504c..ee88e3c5 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 @@ -79,7 +79,6 @@ public class ImportServiceBean extends AbstractServiceBean implements ImportServ } importBean.createCvlcpts(petitions); - return 0; } diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn03Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn03Controller.java index 55fa3795..34259fa0 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn03Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn03Controller.java @@ -124,5 +124,4 @@ public class Crdn03Controller extends ApplicationController { return new ModelAndView("jsonView") .addObject("saved", rtnMsg.contains("[S]")); } - } \ No newline at end of file