From d657ee22cc0d894b02b78309e9ed799fa11127b3 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Wed, 1 Sep 2021 12:33:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=8D=E6=AC=A1=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/datastats/impl/DataStatsServiceImpl.java   | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
index 4667a7b99c..411be35b77 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
@@ -1489,26 +1489,22 @@ public class DataStatsServiceImpl implements DataStatsService {
             formDTO.setDateId(format.format(yesterday));
         }
         String startDate = null;
-        String actulStartDate = null;
         String endDate = formDTO.getDateId();
         Date dateIdDate = DateUtils.parse(formDTO.getDateId(), DateUtils.DATE_PATTERN_YYYYMMDD);
         boolean isYesterday = DateUtils.getBeforeNDay(1,DateUtils.DATE_PATTERN_YYYYMMDD).equals(formDTO.getDateId());
         switch (formDTO.getType()){
             case "yesterday":
                 startDate = DateUtils.getBeforeNDay(formDTO.getDateId(),1);
-                actulStartDate = formDTO.getDateId();
+                endDate = formDTO.getDateId();
                 break;
             case "thisWeek":
                 startDate = DateUtils.getWeekStart(formDTO.getDateId());
-                //startDate = DateUtils.getBeforeNDay(actulStartDate,1);
-                //DateUtils.format(DateUtils.addDateDays(yesterday, -1),DateUtils.DATE_PATTERN_YYYYMMDD);
                 if (!isYesterday){
                     endDate = DateUtils.getWeekEnd(formDTO.getDateId());
                 }
                 break;
             case "thisMonth":
                 startDate = DateUtils.format(DateUtils.getMonthStart(dateIdDate),DateUtils.DATE_PATTERN_YYYYMMDD);
-                //startDate = DateUtils.getBeforeNDay(actulStartDate,1);
                 if (!isYesterday) {
                     endDate = DateUtils.format(DateUtils.getMonthEnd(dateIdDate), DateUtils.DATE_PATTERN_YYYYMMDD);
                 }
@@ -1544,7 +1540,7 @@ public class DataStatsServiceImpl implements DataStatsService {
             Map<String, Integer> closeProjectStartMap = closeProjectStart.stream().collect(Collectors.toMap(SubGridProjectResultDTO::getGridId, SubGridProjectResultDTO::getClosedProjectTotal, (o1, o2) -> o1));
             Map<String, Integer> closeProjectEndMap = closeProjectEnd.stream().collect(Collectors.toMap(SubGridProjectResultDTO::getGridId, SubGridProjectResultDTO::getClosedProjectTotal, (o1, o2) -> o1));
             //巡查次数和时间
-            List<PatrolDailySumResult> patrolList = statsStaffPatrolRecordDailyService.getPatrolSumList(gridIdList,actulStartDate,formDTO.getEndDateId());
+            List<PatrolDailySumResult> patrolList = statsStaffPatrolRecordDailyService.getPatrolSumList(gridIdList,formDTO.getStartDateId(),formDTO.getEndDateId());
             Map<String, PatrolDailySumResult> patrolListMap = patrolList.stream().collect(Collectors.toMap(PatrolDailySumResult::getFullAgencyId, o -> o, (o1, o2) -> o1));
 
             subAgencyList.forEach(agency->{
@@ -1585,7 +1581,7 @@ public class DataStatsServiceImpl implements DataStatsService {
             Map<String, Integer> closeProjectEndMap = closeProjectEnd.stream().collect(Collectors.toMap(SubAgencyProjectResultDTO::getAgencyId, SubAgencyProjectResultDTO::getClosedProjectTotal, (o1, o2) -> o1));
             //巡查次数和时间
             List<String> agencyFullIds = subAgencyList.stream().map(o -> o.getPids().concat(StrConstant.COLON).concat(o.getAgencyId())).collect(Collectors.toList());
-            List<PatrolDailySumResult> patrolList = statsStaffPatrolRecordDailyService.getPatrolSumList(agencyFullIds,actulStartDate,formDTO.getEndDateId());
+            List<PatrolDailySumResult> patrolList = statsStaffPatrolRecordDailyService.getPatrolSumList(agencyFullIds,formDTO.getStartDateId(),formDTO.getEndDateId());
             Map<String, PatrolDailySumResult> patrolListMap = patrolList.stream().collect(Collectors.toMap(PatrolDailySumResult::getFullAgencyId, o -> o, (o1, o2) -> o1));
 
             subAgencyList.forEach(agency->{