From 150b64b099c2ee37b0afc4f9cfdc422a179cc544 Mon Sep 17 00:00:00 2001
From: ysCha <yscha@interplug.co.kr>
Date: Tue, 17 Mar 2026 10:57:28 +0900
Subject: [PATCH 1/2] =?UTF-8?q?[1379]=20=EA=B2=AC=EC=A0=81=EC=84=9C=20?=
 =?UTF-8?q?=EC=A3=BC=EC=86=8C=20=EC=B5=9C=EC=B4=88=20=EC=9B=90=EC=8B=9C=20?=
 =?UTF-8?q?=EC=9B=90=EB=B3=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mappers/estimate/estimateMapper.xml       | 132 +++++++-----------
 1 file changed, 51 insertions(+), 81 deletions(-)

diff --git a/src/main/resources/mappers/estimate/estimateMapper.xml b/src/main/resources/mappers/estimate/estimateMapper.xml
index 90931dbb..376ff64a 100644
--- a/src/main/resources/mappers/estimate/estimateMapper.xml
+++ b/src/main/resources/mappers/estimate/estimateMapper.xml
@@ -91,91 +91,61 @@
 
     <select id="selectEstimatePdfDetail" parameterType="com.interplug.qcast.biz.estimate.dto.EstimateRequest" resultType="com.interplug.qcast.biz.estimate.dto.EstimateResponse">
         /* sqlid : com.interplug.qcast.biz.estimate.selectPdfEstimateDetail */
-        SELECT Z.*
-             , SS3.ZIP_NO AS ZIP_NO3
-             , SS3.ADDRESS AS ADDRESS3
-             , SS3.TEL AS TEL3
-             , SS3.FAX AS FAX3
-             , CASE WHEN Z.CREATE_USER = 'T01' AND ISNULL(Z.FIRST_AGENT_ID,'') = ''  THEN Z.ZIP_NO2
-                    WHEN Z.CREATE_USER = 'T01' AND ISNULL(Z.FIRST_AGENT_ID,'') != '' THEN SS3.ZIP_NO
-                    ELSE Z.ZIP_NO1 END AS ZIP_NO
-             , CASE WHEN Z.CREATE_USER = 'T01' AND ISNULL(Z.FIRST_AGENT_ID,'') = ''  THEN Z.ADDRESS2
-                    WHEN Z.CREATE_USER = 'T01' AND ISNULL(Z.FIRST_AGENT_ID,'') != '' THEN SS3.ADDRESS
-                    ELSE Z.ADDRESS1 END AS ADDRESS
-             , CASE WHEN Z.CREATE_USER = 'T01' AND ISNULL(Z.FIRST_AGENT_ID,'') = ''  THEN Z.TEL2
-                    WHEN Z.CREATE_USER = 'T01' AND ISNULL(Z.FIRST_AGENT_ID,'') != '' THEN SS3.TEL
-                    ELSE Z.TEL1 END AS TEL
-             , CASE WHEN Z.CREATE_USER = 'T01' AND ISNULL(Z.FIRST_AGENT_ID,'') = ''  THEN Z.FAX2
-                    WHEN Z.CREATE_USER = 'T01' AND ISNULL(Z.FIRST_AGENT_ID,'') != '' THEN SS3.FAX
-                    ELSE Z.FAX1 END AS FAX
-        FROM (
-
-                 SELECT
-        T.*
-        , SS1.SALE_STORE_NAME AS CUST_SALE_STORE_NAME
-        , COALESCE(NULLIF(SS2.DISP_COMPANY_NAME, ''), SS2.SALE_STORE_NAME) AS SALE_STORE_NAME
-        , COALESCE(NULLIF(SS2.DISP_ZIP_NO, ''), SS2.ZIP_NO) AS ZIP_NO1
-        , COALESCE(NULLIF(SS2.DISP_ADDRESS, ''), SS2.ADDRESS) AS ADDRESS1
-        , COALESCE(NULLIF(SS2.DISP_TEL, ''), SS2.TEL) AS TEL1
-        , COALESCE(NULLIF(SS2.DISP_FAX, ''), SS2.FAX) AS FAX1
-        , SSI2.BIZ_NO
-        , SS1.ZIP_NO AS ZIP_NO2
-        , SS1.ADDRESS AS ADDRESS2
-        , SS1.TEL AS TEL2
-        , SS1.FAX AS FAX2
-        , SS1.FIRST_AGENT_ID
-        , (SELECT BC.BUSINESS_TEAM_CD  FROM M_BUSINESS_CHARGER BC WHERE  BC.BUSINESS_CHARGER_CD = T.BUSINESS_CHARGER_CD) AS BUSINESS_TEAM_CD
-        FROM
-        (
         SELECT
-        P.OBJECT_NO
-        , P.PLAN_NO
-        , CONVERT(VARCHAR(10), P.DRAWING_ESTIMATE_CREATE_DATE, 121) AS DRAWING_ESTIMATE_CREATE_DATE
-        , P.ESTIMATE_VALIDITY_TERM
-        , P.SNOWFALL
-        , CONVERT(NVARCHAR(10), P.LAST_EDIT_DATETIME, 121) AS ESTIMATE_DATE
-        , PI.ESTIMATE_TYPE
-        , PI.ESTIMATE_OPTION
-        , PI.PKG_ASP
-        , PI.REMARKS
-        , PI.CREATE_USER
-        , O.SALE_STORE_ID
-        , (SELECT SS.BUSINESS_CHARGER_CD FROM M_SALES_STORE SS WHERE SS.SALE_STORE_ID = O.SALE_STORE_ID ) AS BUSINESS_CHARGER_CD
-        , O.OBJECT_NAME
-        , O.OBJECT_NAME_OMIT
-        , (SELECT SALE_STORE_ID FROM M_USER WHERE USER_ID = OI.CREATE_USER) AS CREATE_SALE_STORE_ID
-        , ISNULL(MP.PREF_NAME, '') AS PREF_NAME
-        , ISNULL(MPA.AREA_NAME, '') AS AREA_NAME
-        , ISNULL(C1.CODE_NM, '') AS STANDARD_WIND_SPEED_NAME
-        FROM T_PLAN P WITH (NOLOCK)
-        INNER JOIN T_PLAN_INFO PI WITH (NOLOCK)
-        ON P.OBJECT_NO = PI.OBJECT_NO
-        AND P.PLAN_NO = PI.PLAN_NO
-        INNER JOIN T_OBJECT O WITH (NOLOCK)
-        ON P.OBJECT_NO = O.OBJECT_NO
-        INNER JOIN T_OBJECT_INFO OI WITH (NOLOCK)
-        ON O.OBJECT_NO = OI.OBJECT_NO
-        LEFT OUTER JOIN T_SIMULATION_PREFECTURE MP WITH (NOLOCK)
-        ON O.PREF_ID = MP.PREF_ID
-        LEFT OUTER JOIN T_SIMULATION_AREA MPA WITH (NOLOCK)
-        ON O.PREF_ID = MPA.PREF_ID
-        AND OI.AREA_ID = MPA.AREA_ID
-        AND MPA.DEL_FLG = 0
-        LEFT OUTER JOIN M_COMM_L C1 WITH (NOLOCK)
-        ON C1.HEAD_CD = '202000'
-        AND P.STANDARD_WIND_SPEED_ID = C1.CODE
-        WHERE P.OBJECT_NO = #{objectNo}
-        AND P.PLAN_NO = #{planNo}
-        ) T
-        LEFT OUTER JOIN M_SALES_STORE SS1 WITH (NOLOCK)
+            T.*
+             , SS1.SALE_STORE_NAME AS CUST_SALE_STORE_NAME
+             , COALESCE(NULLIF(SS2.DISP_COMPANY_NAME, ''), SS2.SALE_STORE_NAME) AS SALE_STORE_NAME
+             , COALESCE(NULLIF(SS2.DISP_ZIP_NO, ''), SS2.ZIP_NO) AS ZIP_NO
+             , COALESCE(NULLIF(SS2.DISP_ADDRESS, ''), SS2.ADDRESS) AS ADDRESS
+             , COALESCE(NULLIF(SS2.DISP_TEL, ''), SS2.TEL) AS TEL
+             , COALESCE(NULLIF(SS2.DISP_FAX, ''), SS2.FAX) AS FAX
+             , SSI2.BIZ_NO
+        FROM
+            (
+                SELECT
+                    P.OBJECT_NO
+                     , P.PLAN_NO
+                     , CONVERT(VARCHAR(10), P.DRAWING_ESTIMATE_CREATE_DATE, 121) AS DRAWING_ESTIMATE_CREATE_DATE
+                     , P.ESTIMATE_VALIDITY_TERM
+                     , P.SNOWFALL
+                     , CONVERT(NVARCHAR(10), P.LAST_EDIT_DATETIME, 121) AS ESTIMATE_DATE
+                     , PI.ESTIMATE_TYPE
+                     , PI.ESTIMATE_OPTION
+                     , PI.PKG_ASP
+                     , PI.REMARKS
+                     , O.SALE_STORE_ID
+                     , O.OBJECT_NAME
+                     , O.OBJECT_NAME_OMIT
+                     , (SELECT SALE_STORE_ID FROM M_USER WHERE USER_ID = OI.CREATE_USER) AS CREATE_SALE_STORE_ID
+                     , ISNULL(MP.PREF_NAME, '') AS PREF_NAME
+                     , ISNULL(MPA.AREA_NAME, '') AS AREA_NAME
+                     , ISNULL(C1.CODE_NM, '') AS STANDARD_WIND_SPEED_NAME
+                FROM T_PLAN P WITH (NOLOCK)
+            INNER JOIN T_PLAN_INFO PI WITH (NOLOCK)
+                ON P.OBJECT_NO = PI.OBJECT_NO
+                    AND P.PLAN_NO = PI.PLAN_NO
+                    INNER JOIN T_OBJECT O WITH (NOLOCK)
+                ON P.OBJECT_NO = O.OBJECT_NO
+                    INNER JOIN T_OBJECT_INFO OI WITH (NOLOCK)
+                ON O.OBJECT_NO = OI.OBJECT_NO
+                    LEFT OUTER JOIN T_SIMULATION_PREFECTURE MP WITH (NOLOCK)
+                ON O.PREF_ID = MP.PREF_ID
+                    LEFT OUTER JOIN T_SIMULATION_AREA MPA WITH (NOLOCK)
+                ON O.PREF_ID = MPA.PREF_ID
+                    AND OI.AREA_ID = MPA.AREA_ID
+                    AND MPA.DEL_FLG = 0
+                    LEFT OUTER JOIN M_COMM_L C1 WITH (NOLOCK)
+                ON C1.HEAD_CD = '202000'
+                    AND P.STANDARD_WIND_SPEED_ID = C1.CODE
+                WHERE P.OBJECT_NO = #{objectNo}
+                  AND P.PLAN_NO = #{planNo}
+            ) T
+                LEFT OUTER JOIN M_SALES_STORE SS1 WITH (NOLOCK)
         ON T.SALE_STORE_ID = SS1.SALE_STORE_ID
-        LEFT OUTER JOIN M_SALES_STORE SS2 WITH (NOLOCK)
+            LEFT OUTER JOIN M_SALES_STORE SS2 WITH (NOLOCK)
         ON T.CREATE_SALE_STORE_ID = SS2.SALE_STORE_ID
-        LEFT OUTER JOIN M_SALES_STORE_INFO SSI2 WITH (NOLOCK)
+            LEFT OUTER JOIN M_SALES_STORE_INFO SSI2 WITH (NOLOCK)
         ON T.CREATE_SALE_STORE_ID = SSI2.SALE_STORE_ID
-        )Z
-        LEFT OUTER JOIN M_SALES_STORE SS3 WITH (NOLOCK)
-        ON Z.FIRST_AGENT_ID = SS3.SALE_STORE_ID
     </select>
 
     <select id="selectEstimateApiFailList" resultType="com.interplug.qcast.biz.estimate.dto.EstimateSendResponse">

From b5e3012da45359b0f39797bb6d416775f0740079 Mon Sep 17 00:00:00 2001
From: ysCha <yscha@interplug.co.kr>
Date: Tue, 17 Mar 2026 13:08:44 +0900
Subject: [PATCH 2/2] =?UTF-8?q?[1379]=20=EA=B2=AC=EC=A0=81=EC=84=9C=20?=
 =?UTF-8?q?=EC=A3=BC=EC=86=8C=20=EC=A1=B0=EA=B1=B4=20=EC=9E=AC=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mappers/estimate/estimateMapper.xml       | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/src/main/resources/mappers/estimate/estimateMapper.xml b/src/main/resources/mappers/estimate/estimateMapper.xml
index 376ff64a..ed91b6b9 100644
--- a/src/main/resources/mappers/estimate/estimateMapper.xml
+++ b/src/main/resources/mappers/estimate/estimateMapper.xml
@@ -95,10 +95,35 @@
             T.*
              , SS1.SALE_STORE_NAME AS CUST_SALE_STORE_NAME
              , COALESCE(NULLIF(SS2.DISP_COMPANY_NAME, ''), SS2.SALE_STORE_NAME) AS SALE_STORE_NAME
+             <if test='saleStoreId != null and saleStoreId != "T01"'>
              , COALESCE(NULLIF(SS2.DISP_ZIP_NO, ''), SS2.ZIP_NO) AS ZIP_NO
              , COALESCE(NULLIF(SS2.DISP_ADDRESS, ''), SS2.ADDRESS) AS ADDRESS
              , COALESCE(NULLIF(SS2.DISP_TEL, ''), SS2.TEL) AS TEL
              , COALESCE(NULLIF(SS2.DISP_FAX, ''), SS2.FAX) AS FAX
+             </if>
+             <if test='saleStoreId != null and saleStoreId == "T01"'>
+             , ISNULL((SELECT
+                    SUBSTRING(MCL.REF_CHR3, CHARINDEX('〒', MCL.REF_CHR3) + 1,
+                        CHARINDEX(')', MCL.REF_CHR3, CHARINDEX('〒', MCL.REF_CHR3)) - CHARINDEX('〒', MCL.REF_CHR3) - 1)
+                  FROM M_COMM_L MCL
+                  WHERE MCL.HEAD_CD = '103200'
+                    AND MCL.CODE = T.BUSINESS_TEAM_CD), '') AS ZIP_NO
+             , ISNULL((SELECT
+                    LTRIM(SUBSTRING(MCL.REF_CHR3,
+                        CHARINDEX(')', MCL.REF_CHR3, CHARINDEX('〒', MCL.REF_CHR3)) + 1,
+                        LEN(MCL.REF_CHR3)))
+                  FROM M_COMM_L MCL
+                  WHERE MCL.HEAD_CD = '103200'
+                    AND MCL.CODE = T.BUSINESS_TEAM_CD), '') AS ADDRESS
+             , ISNULL((SELECT MCL.REF_CHR4
+                  FROM M_COMM_L MCL
+                  WHERE MCL.HEAD_CD = '103200'
+                    AND MCL.CODE = T.BUSINESS_TEAM_CD), '') AS TEL
+             , ISNULL((SELECT MCL.REF_CHR5
+                  FROM M_COMM_L MCL
+                  WHERE MCL.HEAD_CD = '103200'
+                    AND MCL.CODE = T.BUSINESS_TEAM_CD), '') AS FAX
+             </if>
              , SSI2.BIZ_NO
         FROM
             (
@@ -117,6 +142,14 @@
                      , O.OBJECT_NAME
                      , O.OBJECT_NAME_OMIT
                      , (SELECT SALE_STORE_ID FROM M_USER WHERE USER_ID = OI.CREATE_USER) AS CREATE_SALE_STORE_ID
+                     <if test='saleStoreId != null and saleStoreId == "T01"'>
+                     , (SELECT BC.BUSINESS_TEAM_CD
+                        FROM M_SALES_STORE SS WITH (NOLOCK)
+                        INNER JOIN M_BUSINESS_CHARGER BC WITH (NOLOCK)
+                            ON SS.BUSINESS_CHARGER_CD = BC.BUSINESS_CHARGER_CD
+                        WHERE SS.SALE_STORE_ID = O.SALE_STORE_ID
+                       ) AS BUSINESS_TEAM_CD
+                     </if>
                      , ISNULL(MP.PREF_NAME, '') AS PREF_NAME
                      , ISNULL(MPA.AREA_NAME, '') AS AREA_NAME
                      , ISNULL(C1.CODE_NM, '') AS STANDARD_WIND_SPEED_NAME