From a5ffc23397ec31716c55ec6e9d3b1acc1a97af80 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 1 Dec 2021 15:10:24 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E7=BB=93=E6=A1=88=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E6=BB=A1=E6=84=8F=E5=BA=A6=E4=BF=AE=E6=94=B9sql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../extract/FactOriginProjectLogDailyDao.xml  | 35 +++++++++++++------
 1 file changed, 25 insertions(+), 10 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 900704c914..9c8a44612f 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
@@ -63,16 +63,31 @@
     </select>-->
     <select id="selectProjectEvaluate" resultType="com.epmet.dto.extract.result.ProjectEvaluateResultDTO">
         SELECT
-            IFNULL(ld.ACTION_CODE,'good') AS actionCode,
-            md.GRID_ID AS gridId,
-            md.ID AS projectId
-        FROM fact_origin_project_main_daily md
-        LEFT JOIN fact_origin_project_log_daily ld ON (ld.PROJECT_ID = md.ID AND ld.DEL_FLAG = 0 AND ld.CUSTOMER_ID = #{customerId} AND ld.ACTION_CODE IN( 'bad','good', 'perfect'))
-        WHERE md.DEL_FLAG = 0
-          AND md.ORIGIN = 'issue'
-          AND md.PROJECT_STATUS = 'closed'
-          AND md.CUSTOMER_ID = #{customerId}
-          AND md.MONTH_ID = #{monthId}
+            IFNULL(en.actionCode,'good') AS actionCode,
+            cl.projectId,
+            cl.gridId
+        FROM
+            (SELECT
+                 ld.PROJECT_ID AS projectId,
+                 ld.ORG_ID AS gridId
+             FROM fact_origin_project_log_daily ld
+             WHERE ld.DEL_FLAG = 0
+               AND ld.CUSTOMER_ID = #{customerId}
+               AND ld.ACTION_CODE IN('close')
+               AND ld.ORG_TYPE = 'grid'
+               AND ld.MONTH_ID = #{monthId}
+            ) cl
+        LEFT JOIN
+            (SELECT
+                 IFNULL(ld.ACTION_CODE,'good') AS actionCode,
+                 ld.ORG_ID AS gridId,
+                 ld.PROJECT_ID AS projectId
+             FROM fact_origin_project_log_daily ld
+             WHERE ld.DEL_FLAG = 0
+               AND ld.ACTION_CODE IN( 'bad','good', 'perfect')
+               AND ld.MONTH_ID = #{monthId}
+               AND ld.CUSTOMER_ID = #{customerId}
+            ) en ON (en.projectId = cl.projectId)
     </select>
 
     <!-- 网格项目自治率查询 -->