From ddfb8d62dd41c382a7e419f7532c2908decbf755 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Fri, 6 Aug 2021 17:30:08 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/StatsStaffPatrolRecordDailyServiceImpl.java   |  5 -----
 .../main/resources/mapper/datastats/DatsStatsDao.xml   | 10 +++++-----
 .../epmetuser/StatsStaffPatrolRecordDailyDao.xml       |  2 +-
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/StatsStaffPatrolRecordDailyServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/StatsStaffPatrolRecordDailyServiceImpl.java
index 41818e1b6d..1d246813f0 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/StatsStaffPatrolRecordDailyServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/StatsStaffPatrolRecordDailyServiceImpl.java
@@ -32,11 +32,6 @@ public class StatsStaffPatrolRecordDailyServiceImpl extends BaseServiceImpl<Stat
      */
     @Override
     public List<StatsStaffPatrolRecordDailyEntity> getPatrolSumList(List<String> agencyList, String startDateId, String endDateId) {
-       /* LambdaQueryWrapper<StatsStaffPatrolRecordDailyEntity> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(StatsStaffPatrolRecordDailyEntity::getDelFlag, NumConstant.ZERO_STR)
-                .between(StatsStaffPatrolRecordDailyEntity::getDateId, startDateId,endDateId)
-                .in(StatsStaffPatrolRecordDailyEntity::getAgencyId, agencyList)
-                ;*/
         return baseDao.getPatrolSumList(agencyList,startDateId,endDateId);
     }
 
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
index d9f6301ad2..eb3f9c7d33 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
@@ -714,10 +714,10 @@
     </select>
     <select id="getAgencySumProject" resultType="com.epmet.dataaggre.dto.datastats.result.TotalAndIncrResultDTO">
          SELECT
-            IFNULL(project_total, 0) AS total,
-            IFNULL(PROJECT_INCR, 0) AS incr,
-            IFNULL(CLOSED_TOTAL, 0) AS total2,
-            IFNULL(CLOSED_INCR, 0) AS incr2
+            SUM(project_total) AS total,
+            SUM(PROJECT_INCR) AS incr,
+            SUM(CLOSED_TOTAL) AS total2,
+            SUM(CLOSED_INCR) AS incr2
         FROM
             fact_agency_project_daily
         WHERE
@@ -738,7 +738,7 @@
         del_flag = '0'
         AND topic_status_id in('discussing','closed','hidden')<!-- 讨论中(热议中！=讨论中)、已处理、已屏蔽 -->
         AND date_id = #{dateId}
-        <foreach item="agencyId" collection="agencyIds" open="AND (" separator="or" close=")" index="">
+        <foreach item="agencyId" collection="agencyList" open="AND (" separator="or" close=")" index="">
             agency_id = #{agencyId}
         </foreach>
     </select>
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StatsStaffPatrolRecordDailyDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StatsStaffPatrolRecordDailyDao.xml
index 4cc36dc640..1e54dc1a1e 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StatsStaffPatrolRecordDailyDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StatsStaffPatrolRecordDailyDao.xml
@@ -10,7 +10,7 @@
         WHERE del_flag = '0'
         AND date_id BETWEEN #{startDateId} and #{endDateId}
         <foreach item="agencyId" collection="agencyList" open="AND (" separator="or" close=")" index="">
-            agency_id = #{agencyId}
+            GRID_PIDS like CONCAT( #{agencyId},'%')
         </foreach>
         GROUP BY customer_id,agency_id
     </select>