| @@ -275,11 +275,15 @@ public class WxActivityServiceImpl implements WxActivityService { | |||||
| Calendar dd = Calendar.getInstance(); | Calendar dd = Calendar.getInstance(); | ||||
| dd.setTime(start); | 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)); | |||||
| map.put("dd", DateUtils.getMonthOfDate(start)); | |||||
| list.add(map); | |||||
| if(start.getTime() >= wxActivity.getStartDate().getTime() | |||||
| && start.getTime() <= wxActivity.getEndDate().getTime()){ | |||||
| Map map = new HashMap<>(); | |||||
| map.put("yyyy", DateUtils.getYear(start)); | |||||
| map.put("mm", DateUtils.getMonth(start)); | |||||
| map.put("dd", DateUtils.getMonthOfDate(start)); | |||||
| list.add(map); | |||||
| } | |||||
| // 天数加上1 | // 天数加上1 | ||||
| dd.add(Calendar.DAY_OF_MONTH, 1); | dd.add(Calendar.DAY_OF_MONTH, 1); | ||||
| start = dd.getTime(); | start = dd.getTime(); | ||||