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 bd57a4df1e..b5a2fe362f 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 @@ -330,20 +330,20 @@ IFNULL( b.count, 0 ) AS "count" FROM - (SELECT f.AGENCY_ID, + (SELECT da.ID AS AGENCY_ID, COUNT( f.ID ) AS "count" FROM fact_origin_project_log_daily f - INNER JOIN dim_agency da ON f.AGENCY_ID = da.ID + INNER JOIN dim_agency da ON f.PIDS LIKE CONCAT( '%', da.ID, '%' ) AND da.`LEVEL` = #{level} WHERE f.IS_ACTIVE = 0 AND f.CUSTOMER_ID = #{customerId} AND f.MONTH_ID = #{monthId} - GROUP BY f.AGENCY_ID ) a + GROUP BY da.ID ) a LEFT JOIN - (SELECT f.AGENCY_ID, + (SELECT da.ID AS AGENCY_ID, COUNT( f.ID ) AS "count" FROM fact_origin_project_log_daily f - INNER JOIN dim_agency da ON f.AGENCY_ID = da.ID + INNER JOIN dim_agency da ON f.PIDS LIKE CONCAT( '%', da.ID, '%' ) AND da.`LEVEL` = #{level} WHERE ( ACTION_CODE = 'close' @@ -354,7 +354,7 @@ AND f.IS_ACTIVE = 1 AND f.CUSTOMER_ID = #{customerId} AND f.MONTH_ID = #{monthId} - GROUP BY f.AGENCY_ID ) b + GROUP BY da.ID ) b ON a.AGENCY_ID = b.AGENCY_ID