Merge branch 'dev'

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

@@ -1069,7 +1069,7 @@
     <select id="selectAgencyClosedProjectStaticDaily" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
         SELECT
             a.ID AS AGENCY_ID,
-            a.`LEVEL`,
+            b.`LEVEL`,
             COUNT( b.PROJECT_ID ) AS "sum",
             SUM(IF( b.ORG_TYPE = 'department', 1, 0 )) AS "count"
         FROM
@@ -1078,7 +1078,8 @@
             SELECT
                     PROJECT_ID,
                     main.PIDS,
-                    ORG_TYPE
+                    ORG_TYPE,
+                    da.`LEVEL`
             FROM
                     fact_origin_project_main_daily main
             INNER JOIN	fact_origin_project_log_daily log ON main.ID = log.PROJECT_ID
@@ -1086,17 +1087,16 @@
                 AND (ORG_TYPE = 'agency' OR ORG_TYPE = 'department')
                 AND log.DEL_FLAG = '0'
                 AND log.CUSTOMER_ID = #{customerId}
+            INNER JOIN dim_agency da ON log.AGENCY_ID = da.ID AND da.CUSTOMER_ID = #{customerId}
             WHERE
                     main.CUSTOMER_ID = #{customerId}
                     AND main.DATE_ID &lt;= #{dateId}
-
-
             ) b ON b.PIDS LIKE CONCAT( '%', a.ID, '%' )
         WHERE
             a.CUSTOMER_ID = #{customerId}
         GROUP BY
             a.ID,
-            a.`LEVEL`
+            b.`LEVEL`
     </select>