Merge pull request 'dev' (#308) from dev into prd-deploy

Reviewed-on: #308

src/main/resources/mappers/estimate/estimateMapper.xml

@@ -395,7 +395,7 @@
                             OR
                     (QCAST_CUST_PRD_ID IS NULL AND PC_ITEM_ID = PE.ITEM_ID)
                             OR
-                    (QCAST_CUST_PRD_ID IS NOT NULL AND QCAST_CUST_PRD_ID != PC_ITEM_ID AND PC_ITEM_ID = PE.ITEM_ID))), 0) AS MODULE_VOL_KW
+                    (QCAST_CUST_PRD_ID IS NOT NULL AND QCAST_CUST_PRD_ID != PC_ITEM_ID AND QCAST_CUST_PRD_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

src/main/resources/mappers/excelDown/excelDownMapper.xml

@@ -128,6 +128,8 @@
             , CONVERT(varchar, A.DRAWING_ESTIMATE_CREATE_DATE, 120) AS DRAWING_ESTIMATE_CREATE_DATE/* プラン見積作成日 */
             -->
         FROM T_OBJECT B
+        LEFT OUTER JOIN T_OBJECT_INFO OI
+            ON OI.OBJECT_NO = B.OBJECT_NO
         LEFT OUTER JOIN T_PLAN A
             ON A.OBJECT_NO = B.OBJECT_NO
         LEFT OUTER JOIN M_COMM_L C1
@@ -176,7 +178,7 @@
         LEFT OUTER JOIN M_SALES_STORE Y
             ON G.FIRST_AGENT_ID = Y.SALE_STORE_ID /*1차점정보*/
         WHERE A.DEL_FLG = 0
-            AND B.DEL_FLG = 0
+            AND (B.DEL_FLG = 0 OR (OI.SOURCE_ORIGIN = 'QCAST_III' AND OI.ORG_DEL_FLG = '0'))
         <if test="sch_startDt != null and sch_startDt != '' and sch_endDt != null and sch_endDt != ''"> <!-- 견적일 -->
             AND B.ESTIMATE_DETAIL_CREATE_DATE <![CDATA[>=]]> #{sch_startDt} + ' 00:00:00'
             AND B.ESTIMATE_DETAIL_CREATE_DATE <![CDATA[<=]]> #{sch_endDt} + ' 23:59:59'
@@ -224,6 +226,8 @@
             , D.FIRST_AGENT_FLG /* 一次代理店フラグ */
             -->
         FROM T_OBJECT C
+        LEFT OUTER JOIN T_OBJECT_INFO OI
+        	ON OI.OBJECT_NO = C.OBJECT_NO
         LEFT OUTER JOIN M_SALES_STORE D
             ON C.SALE_STORE_ID = D.SALE_STORE_ID
         LEFT OUTER JOIN T_PLAN B
@@ -251,7 +255,7 @@
         LEFT OUTER JOIN M_BUSINESS_TEAM K
             ON J.BUSINESS_TEAM_CD = K.BUSINESS_TEAM_CD
             AND K.DEL_FLG = 0
-        WHERE C.DEL_FLG = 0
+        WHERE (C.DEL_FLG = 0 OR (OI.SOURCE_ORIGIN = 'QCAST_III' AND OI.ORG_DEL_FLG = '0'))
             AND D.DEL_FLG = 0
             AND B.DEL_FLG = 0
         <if test="sch_startDt != null and sch_startDt != '' and sch_endDt != null and sch_endDt != ''"> <!-- 견적일 -->