From 07d042fb7fad541dc3d5cb5093e9ecb80a2b89f1 Mon Sep 17 00:00:00 2001
From: "LAPTOP-L3VE7KK2\\USER" <jungpyo2001@interplug.co.kr>
Date: Thu, 20 Feb 2025 16:23:40 +0900
Subject: [PATCH] =?UTF-8?q?=EC=95=84=EC=9D=B4=ED=85=9C=20PCS=20=EC=98=88?=
 =?UTF-8?q?=EC=99=B8=EC=B2=98=EB=A6=AC=20=EA=B0=9C=EB=B0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mappers/estimate/estimateMapper.xml       | 27 ++++++++++++++-----
 .../resources/mappers/object/objectMapper.xml |  9 -------
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/src/main/resources/mappers/estimate/estimateMapper.xml b/src/main/resources/mappers/estimate/estimateMapper.xml
index 2936d96d..1d085688 100644
--- a/src/main/resources/mappers/estimate/estimateMapper.xml
+++ b/src/main/resources/mappers/estimate/estimateMapper.xml
@@ -253,7 +253,9 @@
             , PE.OPEN_FLG
             , PE.ITEM_CHANGE_FLG
             , I.PNOW_W
-            , I.ITEM_GROUP
+            , CASE WHEN I.POWER_COM_FLG = '1' THEN 'PC_'
+                   WHEN I.ITEM_GROUP = 'PC_' AND I.POWER_COM_FLG = '0' THEN 'STORAGE_BATTERY'
+              ELSE I.ITEM_GROUP END AS ITEM_GROUP
             , CASE WHEN I.ITEM_GROUP = 'MODULE_' THEN '1' ELSE '0' END AS MODULE_FLG
         FROM T_PART_ESTIMATE PE WITH (NOLOCK)
         INNER JOIN M_ITEM I WITH (NOLOCK)
@@ -275,7 +277,9 @@
             , I.ITEM_NAME
             , I.UNIT
             , I.PNOW_W
-            , I.ITEM_GROUP
+            , CASE WHEN I.POWER_COM_FLG = '1' THEN 'PC_'
+                   WHEN I.ITEM_GROUP = 'PC_' AND I.POWER_COM_FLG = '0' THEN 'STORAGE_BATTERY'
+              ELSE I.ITEM_GROUP END AS ITEM_GROUP
             , I.PKG_MATERIAL_FLG
             , I.FILE_UPLOAD_FLG
             , I.ITEM_CTG_GR
@@ -300,7 +304,9 @@
             , I.ITEM_NAME
             , I.UNIT
             , I.PNOW_W
-            , I.ITEM_GROUP
+            , CASE WHEN I.POWER_COM_FLG = '1' THEN 'PC_'
+                   WHEN I.ITEM_GROUP = 'PC_' AND I.POWER_COM_FLG = '0' THEN 'STORAGE_BATTERY'
+              ELSE I.ITEM_GROUP END AS ITEM_GROUP
             , I.PKG_MATERIAL_FLG
             , I.FILE_UPLOAD_FLG
             , I.ITEM_CTG_GR
@@ -342,7 +348,7 @@
                 ON PE.ITEM_ID = I.ITEM_ID
             WHERE P.OBJECT_NO = #{objectNo}
                 AND P.PLAN_NO = #{planNo}
-                AND I.ITEM_GROUP = 'PC_'
+                AND I.POWER_COM_FLG = '1' /* PCS 아이템만 */
         ) T
     </select>
 
@@ -442,7 +448,9 @@
                 , RIE.AMOUNT
                 , CAST(RIE.SPECIFICATION AS FLOAT) SPECIFICATION
                 , I.ITEM_ID
-                , I.ITEM_GROUP
+                , CASE WHEN I.POWER_COM_FLG = '1' THEN 'PC_'
+                       WHEN I.ITEM_GROUP = 'PC_' AND I.POWER_COM_FLG = '0' THEN 'STORAGE_BATTERY'
+                  ELSE I.ITEM_GROUP END AS ITEM_GROUP
             FROM T_PLAN P WITH (NOLOCK)
 	        INNER JOIN T_PART_ROOF_ESTIMATE RE WITH (NOLOCK)
                 ON P.OBJECT_NO = RE.OBJECT_NO
@@ -456,7 +464,14 @@
             WHERE P.OBJECT_NO = #{objectNo}
                 AND P.PLAN_NO = #{planNo}
                 <if test='schItemGroup != null and schItemGroup != ""'>
-                AND I.ITEM_GROUP = #{schItemGroup}
+                    <choose>
+                        <when test='schItemGroup == "PC_"'>
+                        AND I.POWER_COM_FLG = '1'
+                        </when>
+                        <otherwise>
+                        AND I.ITEM_GROUP = #{schItemGroup}
+                        </otherwise>
+                    </choose>
                 </if>
         ) T
         GROUP BY T.OBJECT_NO, T.PLAN_NO, T.ROOF_SURFACE_ID, T.ROOF_SURFACE, T.SLOPE, T.ANGLE, T.CLASS_TYPE, T.ITEM_ID
diff --git a/src/main/resources/mappers/object/objectMapper.xml b/src/main/resources/mappers/object/objectMapper.xml
index 06445ba4..329218e7 100644
--- a/src/main/resources/mappers/object/objectMapper.xml
+++ b/src/main/resources/mappers/object/objectMapper.xml
@@ -444,15 +444,6 @@
             , T.DOC_NO
             , T.TEMP_FLG
             , (SELECT SALE_STORE_ID FROM M_USER WHERE USER_ID = O.CREATE_USER) AS CREATE_SALE_STORE_ID
-            , STUFF((
-                SELECT '、' + PE.ITEM_NO
-                FROM T_PART_ESTIMATE PE WITH (NOLOCK)
-                INNER JOIN M_ITEM I WITH (NOLOCK)
-                ON PE.ITEM_ID = I.ITEM_ID
-                WHERE PE.OBJECT_NO = T.OBJECT_NO AND PE.PLAN_NO = T.PLAN_NO
-                AND I.ITEM_GROUP = 'STAND_'
-                FOR XML PATH('')),1,1,''
-              ) AS STAND_TYPE_NO
         FROM T_PLAN T WITH (NOLOCK)
         INNER JOIN T_OBJECT O WITH (NOLOCK)
             ON T.OBJECT_NO = O.OBJECT_NO