Merge branch 'dev_bugfix_ljj' 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
@@ -900,7 +900,7 @@
     </select>
     <select id="getSelfProjectDaily" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
             SELECT
-                da.ID,
+                da.ID AS "agencyId",
                 SUM( sum ) AS "sum",
                 SUM( count ) AS "count"
             FROM
@@ -954,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