From ea873911fb9b1a61a9ee8cb97cf324fbe1e1703c Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Thu, 2 Jul 2020 13:26:25 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=9D=E9=A2=98=E7=BB=9F=E8=AE=A1-=E6=9C=88?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/service/topic/impl/TopicServiceImpl.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/topic/impl/TopicServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/topic/impl/TopicServiceImpl.java
index b4d298fcc4..0bc3aacd65 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/topic/impl/TopicServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/topic/impl/TopicServiceImpl.java
@@ -347,7 +347,7 @@ public class TopicServiceImpl implements TopicService {
                 gridDistinct.put(k,false);
             });
 
-            List<ResiGroupTopicResultDTO> topicsBetweenTimeRange = topicDao.selectGroupOrderByGridBetweenTimeRange(calendar.getTime(),targetDate,dataPacket.getCustomerId());
+            List<ResiGroupTopicResultDTO> topicsBetweenTimeRange = topicDao.selectGroupOrderByGridBetweenTimeRange(calendar.getTime(),targetDateCheck,dataPacket.getCustomerId());
             Map<String,List<ResiGroupTopicResultDTO>> GridGroupMapBetweenTimeRange =
                     topicsBetweenTimeRange.stream().collect(Collectors.groupingBy(ResiGroupTopicResultDTO::getGridId));
             List<ResiGroupTopicResultDTO> groupListBetweenTimeRange = new LinkedList<>();
@@ -357,7 +357,7 @@ public class TopicServiceImpl implements TopicService {
                     groupListBetweenTimeRange.addAll(entryBetweenTimeRange.getValue());
             }
             List<ResiTopicOperationResultDTO> operationsBetweenTimeRange =
-                    topicDao.selectTopicOperationRecordBetweenTimeRange(calendar.getTime(),targetDate);
+                    topicDao.selectTopicOperationRecordBetweenTimeRange(calendar.getTime(),targetDateCheck);
 
             Map<String,List<ResiTopicOperationResultDTO>> topicOperationMapBetweenTimeRange =
                     operationsBetweenTimeRange.stream().collect(Collectors.groupingBy(ResiTopicOperationResultDTO::getTopicId));
@@ -1127,7 +1127,7 @@ public class TopicServiceImpl implements TopicService {
             gridDistinct.put(k,false);
         });
 
-        List<ResiGroupTopicResultDTO> topicsBetweenTimeRange = topicDao.selectGroupOrderByGridBetweenTimeRange(calendar.getTime(),targetDate,dataPacket.getCustomerId());
+        List<ResiGroupTopicResultDTO> topicsBetweenTimeRange = topicDao.selectGroupOrderByGridBetweenTimeRange(calendar.getTime(),targetDateCheck,dataPacket.getCustomerId());
         //key : gridId
         Map<String,List<ResiGroupTopicResultDTO>> GridGroupMapBetweenTimeRange =
                 topicsBetweenTimeRange.stream().collect(Collectors.groupingBy(ResiGroupTopicResultDTO::getGridId));