平阴组织网格项目统计调整引起的查询调整，三个街道的同一组织或网格一天会存在两条统计数据 只是客户Id不同

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml

@@ -331,17 +331,19 @@
     <select id="getSubAgencyProject" resultType="com.epmet.dataaggre.dto.datastats.result.SubAgencyProjectResultDTO">
         SELECT
             agency_id AS agencyId,
-            IFNULL(project_total, 0) AS "projectTotal",
+            <!-- 平阴三个街道的统计数据同一组织同一天会存在两条数据，一条是上报的一条是小程序统计的，所以查询的时候需要按组织分组sum -->
-            IFNULL(pending_total, 0) AS "pendingTotal",
+            SUM(IFNULL(project_total, 0)) AS "projectTotal",
-            IFNULL(closed_total, 0) AS "closedProjectTotal"
+            SUM(IFNULL(pending_total, 0)) AS "pendingTotal",
+            SUM(IFNULL(closed_total, 0)) AS "closedProjectTotal"
         FROM
             fact_agency_project_daily
         WHERE
             del_flag = '0'
         AND date_id = #{dateId}
-        <foreach item="agencyId" collection="agencyIds" open="AND (" separator="or" close=")" index="">
+        <foreach collection="agencyIds" item="agencyId" open="AND agency_id IN (" separator="," close=")">
-            agency_id = #{agencyId}
+            #{agencyId}
         </foreach>
+        GROUP BY agency_id
         ORDER BY
             project_total DESC
     </select>
@@ -349,17 +351,19 @@
     <select id="getSubGridProject" resultType="com.epmet.dataaggre.dto.datastats.result.SubGridProjectResultDTO">
         SELECT
             grid_id AS gridId,
-            IFNULL(project_total, 0) AS "projectTotal",
+        <!-- 平阴三个街道的统计数据同一网格同一天会存在两条数据，一条是上报的一条是小程序统计的，所以查询的时候需要按网格分组sum -->
-            IFNULL(pending_total, 0) AS "pendingTotal",
+            SUM(IFNULL(project_total, 0)) AS "projectTotal",
-            IFNULL(closed_total, 0) AS "closedProjectTotal"
+            SUM(IFNULL(pending_total, 0)) AS "pendingTotal",
+            SUM(IFNULL(closed_total, 0)) AS "closedProjectTotal"
         FROM
             fact_grid_project_daily
         WHERE
             del_flag = '0'
         AND date_id = #{dateId}
-        <foreach item="gridId" collection="gridIds" open="AND (" separator="or" close=")" index="">
+        <foreach collection="gridIds" item="gridId" open="AND grid_id IN (" separator="," close=")">
-            grid_id = #{gridId}
+            #{gridId}
         </foreach>
+        GROUP BY grid_id
         ORDER BY
             project_total DESC
     </select>