话题统计-月逻辑修改

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