Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginIssueMainDailyDao.xml

@@ -167,13 +167,15 @@
     <!-- 查询议题转项目总数 -->
     <select id="selectIssueTotalShiftProject" resultType="com.epmet.dto.extract.form.GridIssueCountResultDTO">
         SELECT
-            GRID_ID,
+            m.GRID_ID,
-            COUNT(ISSUE_ID) AS issueTotal
+            COUNT(m.ID) AS issueTotal
-        FROM fact_origin_issue_log_daily
+        FROM
-        WHERE DEL_FLAG = '0'
+            fact_origin_issue_main_daily m INNER JOIN
-          AND MONTH_ID = #{monthId}
+            fact_origin_issue_log_daily l ON  m.ID = l.ISSUE_ID
-          AND CUSTOMER_ID = #{customerId}
+        WHERE m.DEL_FLAG = '0'
-          AND ACTION_CODE = 'shift_project'
+          AND m.MONTH_ID = #{monthId}
+          AND m.CUSTOMER_ID = #{customerId}
+          AND l.ACTION_CODE = 'shift_project'
         GROUP BY GRID_ID
     </select>
 
@@ -376,4 +378,4 @@
         GROUP BY
             a.ID
     </select>
-</mapper>
+</mapper>