From ca42d158f283b8cd7c7fc95408f979cf1da8ee44 Mon Sep 17 00:00:00 2001
From: mjkhan21 <mjkhan21@xit.co.kr>
Date: Mon, 21 Apr 2025 11:31:40 +0900
Subject: [PATCH] =?UTF-8?q?=EC=86=8C=EC=8A=A4=20=EC=A0=95=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xit/fims/sndb/web/Sndb01Controller.java   | 29 +++++++++----------
 1 file changed, 13 insertions(+), 16 deletions(-)

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<DataObject> 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);
-        List<DataObject>dataObjectList = integrationSearchMapper.selectIntegrationDataList(sprtQuery);
+        List<DataObject> crdnList = integrationSearchMapper.selectIntegrationDataList(new SprtQuery().setCrdnIds(crdnIds));
+        Map<String, List<DataObject>> 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<DataObject> fileList = crdnFiles.get(dataObject.string("CRDN_ID"));
+            if (isEmpty(fileList)) continue;
 
-            FileQuery fileQuery = new FileQuery()
-            	.setInfoType(Crdn.INF_TYPE)
-            	.setInfoKeys(crdnId);
-            List<DataObject> fileInfoList = fileBean.getFileList(fileQuery);
-            for (int j=0; j<fileInfoList.size(); j++) {
-                DataObject fileInfo = fileInfoList.get(j);
-				dataObject.set("CRDN_PHOTO"+(j+1), fileInfo.string("URL"));
+            for (int i = 0; i < fileList.size(); i++) {
+                DataObject fileInfo = fileList.get(i);
+				dataObject.set("CRDN_PHOTO"+(i+1), fileInfo.string("URL"));
                 String fileID = fileInfo.string("FILE_ID");
-				dataObject.set("CRDN_PHOTO"+(j+1)+"KEY", fileID);
+				dataObject.set("CRDN_PHOTO"+(i+1)+"KEY", fileID);
 
                 List<DataObject> 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<String, Object> result = new Nht(print,printOption,otptBscStng,otptArtclStngList,paperSeCd,dataObjectList).makeFile();
+        Map<String, Object> result = new Nht(print,printOption,otptBscStng,otptArtclStngList,paperSeCd,crdnList).makeFile();
 
         return new ModelAndView("downloadView")
         	.addAllObjects(result);