From 1df9e0562fb0f92d542972a3a983e26cf9fcbd75 Mon Sep 17 00:00:00 2001
From: "LAPTOP-L3VE7KK2\\USER" <jungpyo2001@interplug.co.kr>
Date: Tue, 18 Feb 2025 10:48:49 +0900
Subject: [PATCH] =?UTF-8?q?=EC=A7=80=EB=B6=95=EC=9E=AC=20=EC=95=84?=
 =?UTF-8?q?=EC=9D=B4=ED=85=9C=20=EB=AA=A9=EB=A1=9D=20=EB=B9=88=EA=B0=92=20?=
 =?UTF-8?q?=EC=A0=9C=EA=B1=B0,=20=EA=B3=B5=EB=B2=95=20=EC=A4=91=EB=B3=B5?=
 =?UTF-8?q?=20=EC=A0=9C=EA=B1=B0=20=EC=B2=98=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../qcast/biz/estimate/EstimateService.java   |  8 ++++++-
 .../qcast/biz/object/ObjectService.java       | 24 +++++++++++++++----
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java b/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java
index 4f909227..b2ecd7c2 100644
--- a/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java
+++ b/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java
@@ -319,6 +319,7 @@ public class EstimateService {
     }
 
     String splitStr = "、";
+    List<RoofRequest> orgRoofList = new ArrayList<RoofRequest>();
     List<RoofRequest> roofList = new ArrayList<RoofRequest>();
     List<ItemRequest> circuitItemList = estimateRequest.getCircuitItemList();
     List<ItemRequest> itemList = estimateRequest.getItemList();
@@ -345,7 +346,12 @@ public class EstimateService {
         }
 
         // [2]. 지붕재 관련 데이터 셋팅
-        roofList = estimateRequest.getRoofSurfaceList();
+        orgRoofList = estimateRequest.getRoofSurfaceList();
+        for (RoofRequest roofRequest : orgRoofList) {
+          if (!roofRequest.getModuleList().isEmpty()) { // 빈 배열은 지붕재 데이타에서 제거
+            roofList.add(roofRequest);
+          }
+        }
 
         // 지붕재 시공사양 ID
         String constructSpecifications = "";
diff --git a/src/main/java/com/interplug/qcast/biz/object/ObjectService.java b/src/main/java/com/interplug/qcast/biz/object/ObjectService.java
index 34ee17b2..8d792925 100644
--- a/src/main/java/com/interplug/qcast/biz/object/ObjectService.java
+++ b/src/main/java/com/interplug/qcast/biz/object/ObjectService.java
@@ -33,10 +33,7 @@ import java.net.URLConnection;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.RandomStringUtils;
@@ -220,14 +217,16 @@ public class ObjectService {
       planRequest.setObjectNo(objectNo);
       List<PlanResponse> planList = objectMapper.selectPlanList(planRequest);
 
-      // Plan 목록에서 지붕재, 시공방법 동일 데이타 중복 제거
       for (PlanResponse planResponse : planList) {
         String roofCheckDatas = "";
         String roofMaterialIdMultis = "";
         String constructSpecificationMultis = "";
+        String supportMethodIdMultis = "";
         String orgRoofMaterialIdMultis = planResponse.getRoofMaterialIdMulti();
         String orgConstructSpecificationMultis = planResponse.getConstructSpecificationMulti();
+        String orgSupportMethodIdMultis = planResponse.getSupportMethodIdMulti();
 
+        // Plan 목록에서 지붕재, 시공방법 동일 데이타 중복 제거
         if (!StringUtils.isEmpty(orgRoofMaterialIdMultis)
             && !StringUtils.isEmpty(orgConstructSpecificationMultis)) {
           String[] arrOrgRoofMaterialIdMultis = orgRoofMaterialIdMultis.split(splitStr);
@@ -260,6 +259,21 @@ public class ObjectService {
               planResponse.setConstructSpecificationMulti(constructSpecificationMultis);
             }
           }
+
+          // 공법 중복 제거
+          if (!StringUtils.isEmpty(orgSupportMethodIdMultis)) {
+            String[] arrOrgSupportMethodIdMultis = orgSupportMethodIdMultis.split(splitStr);
+            for (String str : arrOrgSupportMethodIdMultis) {
+              if (!supportMethodIdMultis.contains(str)) {
+                supportMethodIdMultis +=
+                    StringUtils.isEmpty(supportMethodIdMultis) ? str : splitStr + str;
+              }
+            }
+
+            if (!StringUtils.isEmpty(supportMethodIdMultis)) {
+              planResponse.setSupportMethodIdMulti(supportMethodIdMultis);
+            }
+          }
         }
       }