Merge remote-tracking branch 'origin/dev' into dev

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

@@ -198,7 +198,7 @@
     </select>
     <select id="getSelfProject" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
             SELECT
-                da.ID,
+                da.ID  AS "agencyId",
                 SUM( sum ) AS "sum",
                 SUM( count ) AS "count"
             FROM
@@ -252,7 +252,7 @@
     </select>
     <select id="getResolveProject" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
             SELECT
-                da.ID,
+                da.ID  AS "agencyId",
                 SUM( sum ) AS "sum",
                 SUM( count ) AS "count"
             FROM
@@ -899,43 +899,8 @@
             ON a.GRID_ID = b.GRID_ID
     </select>
     <select id="getSelfProjectDaily" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
-        SELECT
-            a.AGENCY_ID,
-            a.count AS "sum",
-            IFNULL(b.count,0) AS "count"
-        FROM
-            (SELECT
-                 da.ID AS AGENCY_ID,
-                 COUNT( fm.ID ) AS "count"
-             FROM
-                 fact_origin_project_main_daily fm
-                     INNER JOIN dim_agency da ON fm.PIDS LIKE CONCAT( '%', da.ID, '%' )
-                     AND da.`LEVEL` = #{level}
-             WHERE
-                 fm.PROJECT_STATUS = 'closed'
-               AND fm.CUSTOMER_ID = #{customerId}
-               AND fm.DATE_ID &lt;= #{dateId}
-             GROUP BY
-                 da.ID) a
-                LEFT JOIN
-            (SELECT
-                 da.ID AS AGENCY_ID,
-                 COUNT( fm.ID ) AS "count"
-             FROM
-                 fact_origin_project_main_daily fm
-                     INNER JOIN dim_agency da ON fm.PIDS LIKE CONCAT( '%', da.ID, '%' )
-                     AND da.`LEVEL` = #{level}
-             WHERE
-                 fm.PROJECT_STATUS = 'closed'
-               AND fm.CUSTOMER_ID = #{customerId}
-               AND fm.DATE_ID &lt;= #{dateId}
-               AND fm.FINISH_ORG_IDS LIKE CONCAT('%', fm.AGENCY_ID,'%')
-             GROUP BY
-                 da.ID) b
-            ON a.AGENCY_ID = b.AGENCY_ID
-
             SELECT
-                da.ID,
+                da.ID AS "agencyId",
                 SUM( sum ) AS "sum",
                 SUM( count ) AS "count"
             FROM
@@ -989,7 +954,7 @@
     </select>
     <select id="getResolveProjectDaily" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
         SELECT
-            da.ID,
+            da.ID  AS "agencyId",
             SUM( sum ) AS "sum",
             SUM( count ) AS "count"
         FROM