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

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);
     }
 

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,
+            SUM(project_total) AS total,
-            IFNULL(PROJECT_INCR, 0) AS incr,
+            SUM(PROJECT_INCR) AS incr,
-            IFNULL(CLOSED_TOTAL, 0) AS total2,
+            SUM(CLOSED_TOTAL) AS total2,
-            IFNULL(CLOSED_INCR, 0) AS incr2
+            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>

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>