From e4001ffaabb934340392b318d57c3b842ccc86d5 Mon Sep 17 00:00:00 2001
From: wjt <wujingtao_t@126.com>
Date: Tue, 6 Jun 2023 19:16:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=B5=B1=E8=A8=88=E6=95=B8?=
 =?UTF-8?q?=E6=93=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ReportTokerServiceImpl.java  | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ReportTokerServiceImpl.java b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ReportTokerServiceImpl.java
index 1d6f8482..6b25b63f 100644
--- a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ReportTokerServiceImpl.java
+++ b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ReportTokerServiceImpl.java
@@ -120,29 +120,29 @@ public class ReportTokerServiceImpl implements ReportTokerService {
             map.put("taskName", findByTaskId(taskId));
 
             List<ReportToker> reportTokerByTask = collect.get(taskId);
-            Map<Date, Integer> reportTokerByTime = new HashMap<>();
+            Map<String, Integer> reportTokerByTime = new HashMap<>();
             if (CollUtil.isNotEmpty(reportTokerByTask)) {
                 for (ReportToker reportToker : reportTokerByTask) {
                     int labelNum = 0;
-                    if (reportTokerByTime.containsKey(reportToker.getCreateTime())) {
-                        labelNum = reportTokerByTime.get(reportToker.getCreateTime());
-
+                    String format = DateUtil.format(reportToker.getCreateTime(), "yyyy-MM-dd");
+                    if (reportTokerByTime.containsKey(format)) {
+                        labelNum = reportTokerByTime.get(format);
                     }
                     if (label.equals(SourceLabelConstants.INTENTION)) {
                         if (labelNum + reportToker.getIntention() != 0) {
                             flag = false;
                         }
-                        reportTokerByTime.put(reportToker.getCreateTime(), labelNum + reportToker.getIntention());
+                        reportTokerByTime.put(format, labelNum + reportToker.getIntention());
                     } else if (label.equals(SourceLabelConstants.NOT_INTENTION)) {
                         if (labelNum + reportToker.getNotIntention() != 0) {
                             flag = false;
                         }
-                        reportTokerByTime.put(reportToker.getCreateTime(), labelNum + reportToker.getNotIntention());
+                        reportTokerByTime.put(format, labelNum + reportToker.getNotIntention());
                     } else {
                         if (labelNum + reportToker.getNotTurnOn() != 0) {
                             flag = false;
                         }
-                        reportTokerByTime.put(reportToker.getCreateTime(), labelNum + reportToker.getNotTurnOn());
+                        reportTokerByTime.put(format, labelNum + reportToker.getNotTurnOn());
                     }
                 }
             }
@@ -153,8 +153,9 @@ public class ReportTokerServiceImpl implements ReportTokerService {
             for (int i = 0; i <= between; i++) {
                 HashMap<String, Object> dataMap = new HashMap<>(2);
                 Date date = DateUtil.offsetDay(start, i);
-                dataMap.put("time", DateUtil.format(date, "yyyy-MM-dd"));
-                dataMap.put("labelNum", reportTokerByTime.getOrDefault(date, 0));
+                String format = DateUtil.format(date, "yyyy-MM-dd");
+                dataMap.put("time", format);
+                dataMap.put("labelNum", reportTokerByTime.getOrDefault(format, 0));
                 list.add(dataMap);
             }
             map.put("data", list);