From daff44d1b2f22ca76999561a48cd5c4e330378fd Mon Sep 17 00:00:00 2001
From: ysCha <yscha@interplug.co.kr>
Date: Wed, 21 Jan 2026 11:13:07 +0900
Subject: [PATCH 1/3] =?UTF-8?q?[1375]=EC=9D=B8=EC=A6=9D=EC=9A=A9=EB=9F=89?=
 =?UTF-8?q?=20=EA=B3=84=EC=82=B0=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mappers/estimate/estimateMapper.xml       | 85 +++++++++++--------
 1 file changed, 48 insertions(+), 37 deletions(-)

diff --git a/src/main/resources/mappers/estimate/estimateMapper.xml b/src/main/resources/mappers/estimate/estimateMapper.xml
index 22443a9c..bff81d2f 100644
--- a/src/main/resources/mappers/estimate/estimateMapper.xml
+++ b/src/main/resources/mappers/estimate/estimateMapper.xml
@@ -366,15 +366,47 @@
 
     <select id="selectEstimateRoofCertVolKw" parameterType="com.interplug.qcast.biz.estimate.dto.EstimateRequest" resultType="String">
         /* sqlid : com.interplug.qcast.biz.estimate.selectEstimateRoofCertVolKw */
+            <![CDATA[
         SELECT
-                REPLACE(
-                CAST(
-                ISNULL(
+            CAST(SUM(F.VOL_KW) AS VARCHAR) AS CERT_VOL_KW
+        FROM (
+                 SELECT
+                     T.*,
+                     ROUND((T.AMOUNT * CAST(ISNULL(T.M_SPEC, 0) AS FLOAT) / 1000), 4) AS MODULE_VOL_KW,
+                     ROUND((T.AMOUNT * CAST(ISNULL(T.P_SPEC, 0) AS FLOAT) / 1000), 4) AS PC_VOL_KW,
+                     CASE
+                         WHEN ROUND((T.AMOUNT * CAST(ISNULL(T.M_SPEC, 0) AS FLOAT) / 1000), 4)
+                             < ROUND((T.AMOUNT * CAST(ISNULL(T.P_SPEC, 0) AS FLOAT) / 1000), 4)
+                             THEN ROUND((T.AMOUNT * CAST(ISNULL(T.M_SPEC, 0) AS FLOAT) / 1000), 4)
+                         ELSE ROUND((T.AMOUNT * CAST(ISNULL(T.P_SPEC, 0) AS FLOAT) / 1000), 4)
+                         END AS VOL_KW
+                 FROM (
+                          SELECT DISTINCT
+                              TPR.ITEM_ID,
+                              TPR.ITEM_NO,
+                              TPR.ITEM_NAME,
+                              TPR.SPECIFICATION AS M_SPEC,
+                              TPR.AMOUNT,
+                              TPC.ITEM_ID AS PC_ITEM_ID,
+                              (SELECT PNOW_W FROM M_ITEM WHERE ITEM_ID = TPC.ITEM_ID) AS P_SPEC,
+                              TPC.CIRCUIT_CFG
+                          FROM T_PART_CIRCUIT_ITEM_ESTIMATE TPC
+                                   INNER JOIN T_PART_ROOF_ITEM_ESTIMATE TPR
+                                              ON TPC.OBJECT_NO = TPR.OBJECT_NO
+                                                  AND TPC.PLAN_NO = TPR.PLAN_NO
+                          WHERE TPC.OBJECT_NO = #{objectNo}
+                            AND TPC.PLAN_NO = #{planNo}
+                      ) T
+             ) F
+        ]]>
+        /*
+        SELECT
+              -- FORMAT(ISNULL(SUM(CASE WHEN T.MODULE_VOL_KW <![CDATA[ <= ]]> T.PC_VOL_KW THEN T.MODULE_VOL_KW ELSE T.PC_VOL_KW END), 0), '#,##0.000') AS CERT_VOL_KW
+              REPLACE(CONVERT(VARCHAR, SUM(CAST(ISNULL(
                 CASE
-                WHEN 0 <![CDATA[ < ]]> SUM(T.CUST_VOL_KW) AND SUM(T.CUST_VOL_KW) <![CDATA[ < ]]> SUM(T.MODULE_VOL_KW) THEN SUM(T.CUST_VOL_KW)
-                WHEN 0 <![CDATA[ < ]]> SUM(T.PCS_VOL_KW)  AND SUM(T.PCS_VOL_KW)  <![CDATA[ < ]]> SUM(T.MODULE_VOL_KW) THEN SUM(T.PCS_VOL_KW)
-                ELSE SUM(T.MODULE_VOL_KW)
-                END, 0 ) AS NUMERIC(18, 3)), ',', '') AS CERT_VOL_KW
+                WHEN T.MODULE_VOL_KW <![CDATA[ <= ]]> T.PC_VOL_KW THEN T.MODULE_VOL_KW
+                ELSE T.PC_VOL_KW
+                END, 0) AS NUMERIC(18, 3))), 1), ',', '') AS CERT_VOL_KW
         FROM
         (
             SELECT
@@ -385,29 +417,12 @@
                 , 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_PART_ROOF_ITEM_ESTIMATE (NOLOCK)
-                WHERE OBJECT_NO = PE.OBJECT_NO
-                AND PLAN_NO = PE.PLAN_NO
-                AND QCAST_CUST_PRD_ID = PE.ITEM_ID), 0) AS CUST_VOL_KW
-                , ISNULL((
-                SELECT
-                SUM((AMOUNT * CAST(ISNULL(SPECIFICATION, 0) AS FLOAT) / 1000))
-                FROM T_PART_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 PCS_VOL_KW
-                , ISNULL((
-                SELECT
-                SUM((AMOUNT * CAST(ISNULL(SPECIFICATION, 0) AS FLOAT) / 1000))
-                FROM T_PART_ROOF_ITEM_ESTIMATE (NOLOCK)
-                WHERE OBJECT_NO = PE.OBJECT_NO
-                AND PLAN_NO = PE.PLAN_NO
-                AND ITEM_ID = PE.ITEM_ID), 0) AS MODULE_VOL_KW
-
-             FROM T_PLAN P WITH (NOLOCK)
+                , ISNULL((SELECT SUM((AMOUNT * CAST(ISNULL(SPECIFICATION, 0) AS FLOAT) / 1000))
+                          FROM T_PART_ROOF_ITEM_ESTIMATE(NOLOCK)
+                          WHERE OBJECT_NO = PE.OBJECT_NO
+                            AND PLAN_NO = PE.PLAN_NO
+                            AND ISNULL(NULLIF(QCAST_CUST_PRD_ID, ''), PC_ITEM_ID) = PE.ITEM_ID ), 0) AS MODULE_VOL_KW
+            FROM T_PLAN P WITH (NOLOCK)
             INNER JOIN T_PART_ESTIMATE PE WITH (NOLOCK)
                 ON P.OBJECT_NO = PE.OBJECT_NO
                 AND P.PLAN_NO = PE.PLAN_NO
@@ -415,14 +430,10 @@
                 ON PE.ITEM_ID = I.ITEM_ID
             WHERE P.OBJECT_NO = #{objectNo}
                 AND P.PLAN_NO = #{planNo}
-               AND (
-                CASE
-                    WHEN I.POWER_COM_FLG = '1' THEN 1
-                    WHEN I.POWER_COM_FLG != '1' AND  ISNULL(I.PNOW_W, 0) > 0 THEN 1
-                    ELSE 0
-                END
-             ) = 1
+                AND I.POWER_COM_FLG = '1' /* PCS 아이템만 */
         ) T
+        */
+
     </select>
 
     <select id="selectEstimateRoofList" parameterType="com.interplug.qcast.biz.estimate.dto.EstimateRequest" resultType="com.interplug.qcast.biz.estimate.dto.RoofResponse">

From 0e4206594095004e9fcf5c379bd0fc3b79d052d2 Mon Sep 17 00:00:00 2001
From: ysCha <yscha@interplug.co.kr>
Date: Wed, 21 Jan 2026 11:21:14 +0900
Subject: [PATCH 2/3] =?UTF-8?q?[1375]=EC=9D=B8=EC=A6=9D=EC=9A=A9=EB=9F=89?=
 =?UTF-8?q?=20=EA=B3=84=EC=82=B0=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mappers/estimate/estimateMapper.xml       | 34 -------------------
 1 file changed, 34 deletions(-)

diff --git a/src/main/resources/mappers/estimate/estimateMapper.xml b/src/main/resources/mappers/estimate/estimateMapper.xml
index bff81d2f..a8e08298 100644
--- a/src/main/resources/mappers/estimate/estimateMapper.xml
+++ b/src/main/resources/mappers/estimate/estimateMapper.xml
@@ -399,40 +399,6 @@
                       ) T
              ) F
         ]]>
-        /*
-        SELECT
-              -- FORMAT(ISNULL(SUM(CASE WHEN T.MODULE_VOL_KW <![CDATA[ <= ]]> T.PC_VOL_KW THEN T.MODULE_VOL_KW ELSE T.PC_VOL_KW END), 0), '#,##0.000') AS CERT_VOL_KW
-              REPLACE(CONVERT(VARCHAR, SUM(CAST(ISNULL(
-                CASE
-                WHEN T.MODULE_VOL_KW <![CDATA[ <= ]]> T.PC_VOL_KW THEN T.MODULE_VOL_KW
-                ELSE T.PC_VOL_KW
-                END, 0) AS NUMERIC(18, 3))), 1), ',', '') AS CERT_VOL_KW
-        FROM
-        (
-            SELECT
-                  P.OBJECT_NO
-                , P.PLAN_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_PART_ROOF_ITEM_ESTIMATE(NOLOCK)
-                          WHERE OBJECT_NO = PE.OBJECT_NO
-                            AND PLAN_NO = PE.PLAN_NO
-                            AND ISNULL(NULLIF(QCAST_CUST_PRD_ID, ''), PC_ITEM_ID) = PE.ITEM_ID ), 0) AS MODULE_VOL_KW
-            FROM T_PLAN P WITH (NOLOCK)
-            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 PE.ITEM_ID = I.ITEM_ID
-            WHERE P.OBJECT_NO = #{objectNo}
-                AND P.PLAN_NO = #{planNo}
-                AND I.POWER_COM_FLG = '1' /* PCS 아이템만 */
-        ) T
-        */
 
     </select>
 

From 51624587fa7e58fddcb8ec3ec7b79cb6fd0804bb Mon Sep 17 00:00:00 2001
From: ysCha <yscha@interplug.co.kr>
Date: Wed, 21 Jan 2026 11:30:56 +0900
Subject: [PATCH 3/3] =?UTF-8?q?[1375]=EC=9D=B8=EC=A6=9D=EC=9A=A9=EB=9F=89?=
 =?UTF-8?q?=20=EA=B3=84=EC=82=B0=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mappers/estimate/estimateMapper.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/mappers/estimate/estimateMapper.xml b/src/main/resources/mappers/estimate/estimateMapper.xml
index a8e08298..3cced394 100644
--- a/src/main/resources/mappers/estimate/estimateMapper.xml
+++ b/src/main/resources/mappers/estimate/estimateMapper.xml
@@ -368,7 +368,7 @@
         /* sqlid : com.interplug.qcast.biz.estimate.selectEstimateRoofCertVolKw */
             <![CDATA[
         SELECT
-            CAST(SUM(F.VOL_KW) AS VARCHAR) AS CERT_VOL_KW
+            CAST(SUM(F.VOL_KW) AS NUMERIC(18, 3)) AS CERT_VOL_KW
         FROM (
                  SELECT
                      T.*,