Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev_screen_data_an_2.0

epmet-gateway/src/main/resources/bootstrap.yml

@@ -441,6 +441,7 @@ epmet:
   # 外部应用认证，使用AccessToken等头进行认证
   externalAuthUrls:
     - /data/report/**
+    - /data/stats/**
     - /epmetuser/customerstaff/customerlist
 
   swaggerUrls:

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

@@ -362,7 +362,7 @@
         grid.DEL_FLAG = '0'
         AND grid.CUSTOMER_ID = #{customerId}
         ) gridInfo ON project.GRID_ID = gridInfo.dimGridId
-        LEFT JOIN ( SELECT PROJECT_ID, COUNT( DISTINCT ORG_ID ) AS reOrg FROM fact_origin_project_org_period_daily WHERE DEL_FLAG = '0' AND CUSTOMER_ID = = #{customerId} GROUP BY PROJECT_ID ) relation ON project.ID = relation.PROJECT_ID
+        LEFT JOIN ( SELECT PROJECT_ID, COUNT( DISTINCT ORG_ID ) AS reOrg FROM fact_origin_project_org_period_daily WHERE DEL_FLAG = '0' AND CUSTOMER_ID = #{customerId} GROUP BY PROJECT_ID ) relation ON project.ID = relation.PROJECT_ID
         LEFT JOIN (
         SELECT
         PROJECT_ID,