diff --git a/src/main/java/com/gunshi/project/xyt/util/DateUtil.java b/src/main/java/com/gunshi/project/xyt/util/DateUtil.java index ba4e66f..203e6a8 100644 --- a/src/main/java/com/gunshi/project/xyt/util/DateUtil.java +++ b/src/main/java/com/gunshi/project/xyt/util/DateUtil.java @@ -197,13 +197,16 @@ public class DateUtil { public static List getDatesBetween(Date startDate, Date endDate,Boolean isDesc) { List dates = new ArrayList<>(); Calendar calendar = Calendar.getInstance(); - calendar.setTime(startDate); - - while (calendar.getTime().before(endDate)) { - dates.add(convertDateToString(calendar.getTime())); + while (startDate.getTime()<=endDate.getTime()){ + // 把日期添加到集合 + dates.add(convertDateToString(startDate)); + // 设置日期 + calendar.setTime(startDate); + //把日期增加一天 calendar.add(Calendar.DATE, 1); + // 获取增加后的日期 + startDate=calendar.getTime(); } - dates.add(convertDateToString(endDate)); if(isDesc){ return dates.reversed(); }