From a42b97a2a66c42bcd03c6b1e5043b93ebf5bcdb4 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Mon, 15 Nov 2021 17:17:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=88=E8=BF=9B=E6=8E=92=E8=A1=8C=E7=BD=91?=
 =?UTF-8?q?=E6=A0=BC=E9=A1=B9=E7=9B=AE=E7=BB=93=E6=A1=88=E7=8E=87=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../extract/FactOriginProjectLogDailyDao.xml  | 46 ++++++++++---------
 1 file changed, 24 insertions(+), 22 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml
index 92dd3ee38a..3c9de3e83b 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml
@@ -488,30 +488,32 @@
     </select>
     <select id="selectGridClosed" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
         SELECT
-            a.ORG_ID,
+            a.GRID_ID,
             a.count AS "sum",
-            IFNULL(b.count,0)AS "count"
+            IFNULL( b.count, 0 ) AS "count"
         FROM
-            (SELECT ORG_ID,
-                    COUNT(DISTINCT PROJECT_ID) AS "count"
-             FROM fact_origin_project_log_daily
-             WHERE( ACTION_CODE = 'created' OR ACTION_CODE = 'transfer')
-               AND IS_ACTIVE = 0
-               AND ORG_TYPE = 'grid'
-               AND CUSTOMER_ID = #{customerId}
-               AND MONTH_ID = #{monthId}
-             GROUP BY ORG_ID) a
-                LEFT JOIN
-            (SELECT fl.ORG_ID,
-                    COUNT(DISTINCT fl.PROJECT_ID) AS "count"
-             FROM fact_origin_project_log_daily fl
-                      INNER JOIN fact_origin_project_main_daily fm ON fl.PROJECT_ID = fm.ID AND fm.PROJECT_STATUS = 'closed'
-             WHERE( fl.ACTION_CODE = 'created' OR fl.ACTION_CODE = 'transfer')
-               AND fl.IS_ACTIVE = 0
-               AND fl.ORG_TYPE = 'grid'
-               AND fl.CUSTOMER_ID = #{customerId}
-               AND fl.MONTH_ID = #{monthId}
-             GROUP BY fl.ORG_ID) b ON a.ORG_ID = b.ORG_ID
+            ( SELECT
+                    GRID_ID,
+                    COUNT( ID ) AS "count"
+                FROM
+                    fact_origin_project_main_daily
+                WHERE
+                    CUSTOMER_ID = #{customerId}
+                    AND MONTH_ID = #{monthId}
+                    AND GRID_ID != ''
+                GROUP BY GRID_ID ) a
+        LEFT JOIN
+        ( SELECT
+                GRID_ID,
+                COUNT( ID ) AS "count"
+            FROM fact_origin_project_main_daily
+            WHERE
+                PROJECT_STATUS = 'closed'
+                AND CUSTOMER_ID = #{customerId}
+                AND MONTH_ID = #{monthId}
+                AND GRID_ID != ''
+            GROUP BY GRID_ID ) b
+        ON a.GRID_ID = b.GRID_ID
     </select>
 
     <select id="selectNotReturn" resultType="com.epmet.dto.extract.result.TransferRightRatioResultDTO">