From 2ed1f4f87ae2e55736ec75b5a64a409f6b8cac60 Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 28 Jan 2021 15:28:09 +0800 Subject: [PATCH] sql --- .../com/iformall/service/impl/WxActivityServiceImpl.java | 6 +++--- .../src/main/java/com/iformall/utils/DateUtils.java | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java index ad9cf1b94..3d3815036 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java @@ -269,12 +269,12 @@ public class WxActivityServiceImpl implements WxActivityService { if(activityList != null){ for (WxActivity activity:activityList) { - Date start = activity.getActivityStartTime(); - Date end = activity.getActivityEndTime(); + Date start = DateUtils.getDateZero(activity.getActivityStartTime()); + Date end = DateUtils.getDateZero(activity.getActivityEndTime()); Calendar dd = Calendar.getInstance(); dd.setTime(start); - while (start.getTime() < end.getTime()) { + while (start.getTime() <= end.getTime()) { Map map = new HashMap<>(); map.put("yyyy", DateUtils.getYear(start)); map.put("mm", DateUtils.getMonth(start)); diff --git a/mallinkService/src/main/java/com/iformall/utils/DateUtils.java b/mallinkService/src/main/java/com/iformall/utils/DateUtils.java index 18c8d2215..625872b0b 100755 --- a/mallinkService/src/main/java/com/iformall/utils/DateUtils.java +++ b/mallinkService/src/main/java/com/iformall/utils/DateUtils.java @@ -1374,6 +1374,7 @@ public class DateUtils { cal.set(Calendar.HOUR_OF_DAY, 0); cal.set(Calendar.MINUTE, 0); cal.set(Calendar.SECOND, 0); + cal.set(Calendar.MILLISECOND, 0); return cal.getTime(); }