Alawn/springboot-payment
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge

Browse Source
This commit is contained in:
xiangwbs
2017-12-27 19:54:36 +08:00
parent 6902ce0b4e
commit 172dec219a
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
boot-service/src/main/java/com/xwbing/util/DateUtil2.java
+2 -8
View File
@@ -282,13 +282,8 @@ public class DateUtil2 {
LocalDate start = LocalDate.parse(startMoth + "-01");
LocalDate end = LocalDate.parse(endMonth + "-01");
List<String> list = new ArrayList<>();
if (startMoth.equals(endMonth)) {
list.add(startMoth);
return list;
}
long m = ChronoUnit.MONTHS.between(start, end);
list.add(start.toString());
for (long i = 1; i <= m; i++) {
for (long i = 0; i <= m; i++) {
list.add(start.plusMonths(i).format(getDateFormat(YYYY_MM)));
}
return list;
@@ -306,8 +301,7 @@ public class DateUtil2 {
LocalDate start = LocalDate.parse(startDate);
LocalDate end = LocalDate.parse(endDate);
long d = ChronoUnit.DAYS.between(start, end);
dateList.add(start.toString());
for (long i = 1; i <= d; i++) {
for (long i = 0; i <= d; i++) {
dateList.add(start.plusDays(i).toString());
}
return dateList;