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 reportTokerByTask = collect.get(taskId); - Map reportTokerByTime = new HashMap<>(); + Map 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 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);