diff --git a/src/main/java/cokr/xit/fims/sndb/web/Sndb01Controller.java b/src/main/java/cokr/xit/fims/sndb/web/Sndb01Controller.java index 57e0e324..95bafa5b 100644 --- a/src/main/java/cokr/xit/fims/sndb/web/Sndb01Controller.java +++ b/src/main/java/cokr/xit/fims/sndb/web/Sndb01Controller.java @@ -2005,26 +2005,21 @@ public class Sndb01Controller extends ApplicationController { // 고지서 출력 대상 자료 조회 List list = sndngDtlService.getSndngTrgtDtlIds(req); String[] crdnIds = list.stream().map(row -> row.string("CRDN_ID")).toList().toArray(new String[list.size()]); - UserInfo userInfo = currentUser(); - ogdpBean.initUserInfo(userInfo); // 단속 대장 조회 - SprtQuery sprtQuery = new SprtQuery() - .setCrdnIds(crdnIds); - ListdataObjectList = integrationSearchMapper.selectIntegrationDataList(sprtQuery); + List crdnList = integrationSearchMapper.selectIntegrationDataList(new SprtQuery().setCrdnIds(crdnIds)); + Map> crdnFiles = fileBean.getFileList(new FileQuery().setInfoType(Crdn.INF_TYPE).setInfoKeys(crdnIds)).stream() + .collect(Collectors.groupingBy(row -> row.string("INF_KEY"))); - for (DataObject dataObject: dataObjectList) { - String crdnId = dataObject.string("CRDN_ID"); + for (DataObject dataObject: crdnList) { + List fileList = crdnFiles.get(dataObject.string("CRDN_ID")); + if (isEmpty(fileList)) continue; - FileQuery fileQuery = new FileQuery() - .setInfoType(Crdn.INF_TYPE) - .setInfoKeys(crdnId); - List fileInfoList = fileBean.getFileList(fileQuery); - for (int j=0; j mosSet = mediaBean.getMosaicList(fileID); if (!isEmpty(mosSet)) @@ -2032,6 +2027,8 @@ public class Sndb01Controller extends ApplicationController { } } + UserInfo userInfo = currentUser(); + ogdpBean.initUserInfo(userInfo); Print print = new Print(); print.setPrintRequestUserInfo(userInfo); @@ -2062,7 +2059,7 @@ public class Sndb01Controller extends ApplicationController { globalVariable.put("bcrnImgPath", otptBscStng.string("BCRN_IMG_PATH")); } printOption.setGlobalVariable(globalVariable); - Map result = new Nht(print,printOption,otptBscStng,otptArtclStngList,paperSeCd,dataObjectList).makeFile(); + Map result = new Nht(print,printOption,otptBscStng,otptArtclStngList,paperSeCd,crdnList).makeFile(); return new ModelAndView("downloadView") .addAllObjects(result);