Merge remote-tracking branch 'origin/dev'

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,
+            IFNULL(en.actionCode,'good') AS actionCode,
-            md.GRID_ID AS gridId,
+            cl.projectId,
-            md.ID AS projectId
+            cl.gridId
-        FROM fact_origin_project_main_daily md
+        FROM
-        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'))
+            (SELECT
-        WHERE md.DEL_FLAG = 0
+                 ld.PROJECT_ID AS projectId,
-          AND md.ORIGIN = 'issue'
+                 ld.ORG_ID AS gridId
-          AND md.PROJECT_STATUS = 'closed'
+             FROM fact_origin_project_log_daily ld
-          AND md.CUSTOMER_ID = #{customerId}
+             WHERE ld.DEL_FLAG = 0
-          AND md.MONTH_ID = #{monthId}
+               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>
 
     <!-- 网格项目自治率查询 -->