From 9c593240673be73c220b01ec4512565dac8c294b Mon Sep 17 00:00:00 2001
From: "LAPTOP-L3VE7KK2\\USER" <jungpyo2001@interplug.co.kr>
Date: Thu, 9 Jan 2025 16:49:54 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B2=AC=EC=A0=81=EC=84=9C=20PDF=20=EB=8B=A4?=
 =?UTF-8?q?=EC=9A=B4=EB=A1=9C=EB=93=9C=20=EC=9D=B8=EC=A6=9D=EC=9A=A9?=
 =?UTF-8?q?=EB=9F=89=20=EC=9E=AC=EA=B3=84=EC=82=B0=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../qcast/biz/estimate/EstimateService.java   |  1 -
 .../mappers/estimate/estimateMapper.xml       | 39 +++++++------------
 2 files changed, 14 insertions(+), 26 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 5635531f..89638a8a 100644
--- a/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java
+++ b/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java
@@ -823,7 +823,6 @@ public class EstimateService {
           itemRequest.setSpecification(roofItemResponse.getSpecification());
           itemRequest.setAmount(roofItemResponse.getAmount());
           itemRequest.setPcItemId(roofItemResponse.getPcItemId());
-          itemRequest.setCircuit(roofItemResponse.getCircuit());
 
           estimateMapper.insertEstimateRoofItem(itemRequest);
         }
diff --git a/src/main/resources/mappers/estimate/estimateMapper.xml b/src/main/resources/mappers/estimate/estimateMapper.xml
index a55d5321..e5d15d39 100644
--- a/src/main/resources/mappers/estimate/estimateMapper.xml
+++ b/src/main/resources/mappers/estimate/estimateMapper.xml
@@ -298,33 +298,25 @@
             SELECT
                   P.OBJECT_NO
                 , P.PLAN_NO
-                , RE.ROOF_NO
-                , RE.ROOF_SURFACE
-                , ROUND(CAST(RE.SLOPE AS FLOAT), 2) AS SLOPE
-                , RIE.AMOUNT
-                , CAST(RIE.SPECIFICATION AS FLOAT) SPECIFICATION
-                , ROUND((RIE.AMOUNT * CAST(ISNULL(RIE.SPECIFICATION, 0) AS FLOAT) / 1000), 4) AS PC_VOL_KW
-                , I.ITEM_ID
-                , I.ITEM_NO
+                , PE.ITEM_ID
+                , PE.AMOUNT
+                , PE.SPECIFICATION
+                , I.ITEM_NAME
+                , ROUND((PE.AMOUNT * CAST(ISNULL(PE.SPECIFICATION, 0) AS FLOAT) / 1000), 4) AS PC_VOL_KW
                 , ISNULL((
                     SELECT
-                        SUM((AMOUNT * CAST(ISNULL(SPECIFICATION, 0) AS FLOAT) / 1000))
-                    FROM T_ROOF_ITEM_ESTIMATE
-                    WHERE ROOF_NO = RIE.ROOF_NO
-                        AND OBJECT_NO = RIE.OBJECT_NO
-                        AND PLAN_NO = RIE.PLAN_NO
-                        AND PC_ITEM_ID = RIE.ITEM_ID
+                    SUM((AMOUNT * CAST(ISNULL(SPECIFICATION, 0) AS FLOAT) / 1000))
+                    FROM T_ROOF_ITEM_ESTIMATE (NOLOCK)
+                    WHERE OBJECT_NO = PE.OBJECT_NO
+                    AND PLAN_NO = PE.PLAN_NO
+                    AND PC_ITEM_ID = PE.ITEM_ID
                   ), 0) AS MODULE_VOL_KW
             FROM T_PLAN P WITH (NOLOCK)
-            INNER JOIN T_ROOF_ESTIMATE RE WITH (NOLOCK)
-                ON P.OBJECT_NO = RE.OBJECT_NO
-                AND P.PLAN_NO = RE.PLAN_NO
-            INNER JOIN T_ROOF_ITEM_ESTIMATE RIE WITH (NOLOCK)
-                ON RE.ROOF_NO = RIE.ROOF_NO
-                AND RE.OBJECT_NO = RE.OBJECT_NO
-                AND RE.PLAN_NO = RE.PLAN_NO
+            INNER JOIN T_PART_ESTIMATE PE WITH (NOLOCK)
+                ON P.OBJECT_NO = PE.OBJECT_NO
+                AND P.PLAN_NO = PE.PLAN_NO
             INNER JOIN M_ITEM I WITH (NOLOCK)
-                ON RIE.ITEM_ID = I.ITEM_ID
+                ON PE.ITEM_ID = I.ITEM_ID
             WHERE P.OBJECT_NO = #{objectNo}
                 AND P.PLAN_NO = #{planNo}
                 AND I.ITEM_GROUP = 'PC_'
@@ -379,7 +371,6 @@
             , ISNULL(PIE.SPECIFICATION, '') AS SPECIFICATION
             , PIE.AMOUNT
             , PIE.PC_ITEM_ID
-            , PIE.CIRCUIT
         FROM T_ROOF_ITEM_ESTIMATE PIE WITH (NOLOCK)
         WHERE PIE.OBJECT_NO = #{objectNo}
             AND PIE.PLAN_NO = #{planNo}
@@ -838,7 +829,6 @@
             , SPECIFICATION
             , AMOUNT
             , PC_ITEM_ID
-            , CIRCUIT
         )
         SELECT
               #{roofNo} AS ROOF_NO
@@ -850,7 +840,6 @@
             , I.PNOW_W
             , #{amount}
             , #{pcItemId}
-            , #{circuit}
         FROM M_ITEM I WITH (NOLOCK)
         WHERE I.ITEM_ID = #{itemId}
     </insert>