Merge branch 'dev_screen_data_2.0' into dev_temp

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

@@ -493,7 +493,7 @@
             IFNULL(b.count,0)AS "count"
         FROM
             (SELECT ORG_ID,
-                    COUNT(ID) AS "count"
+                    COUNT(DISTINCT PROJECT_ID) AS "count"
              FROM fact_origin_project_log_daily
              WHERE( ACTION_CODE = 'created' OR ACTION_CODE = 'transfer')
                AND IS_ACTIVE = 0
@@ -503,7 +503,7 @@
              GROUP BY ORG_ID) a
                 LEFT JOIN
             (SELECT fl.ORG_ID,
-                    COUNT(fl.ID) AS "count"
+                    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')