diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java index a2766d28a..b3c31c8e4 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java @@ -7,6 +7,7 @@ import com.jsowell.common.core.controller.BaseController; import com.jsowell.common.enums.ykc.ReturnCodeEnum; import com.jsowell.common.exception.BusinessException; import com.jsowell.common.response.RestApiResponse; +import com.jsowell.common.util.DateUtils; import com.jsowell.pile.domain.MemberPlateNumberRelation; import com.jsowell.pile.dto.CarVinDTO; import com.jsowell.pile.dto.QueryOrderDTO; @@ -113,9 +114,8 @@ public class TempController extends BaseController { try { String startTime = dto.getStartTime(); String endTime = dto.getEndTime(); - - List dateList = Lists.newArrayList(); - + // 获取日期区间内所有日期 + List dateList = DateUtils.getAllDatesInTheDateRange(startTime, endTime); dto.getStationIdList().parallelStream().forEach(stationId -> { for (String tradeDate : dateList) { diff --git a/jsowell-common/src/main/java/com/jsowell/common/util/DateUtils.java b/jsowell-common/src/main/java/com/jsowell/common/util/DateUtils.java index fdb220a61..793803123 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/util/DateUtils.java +++ b/jsowell-common/src/main/java/com/jsowell/common/util/DateUtils.java @@ -153,6 +153,9 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils { public static void main(String[] args) throws ParseException { String startDate = "2023-07-01"; String endDate = "2023-07-20"; + LocalDate of = LocalDate.of(2023, 07, 20); + System.out.println(of); + List list = getAllDatesInTheDateRange(startDate, endDate); System.out.println(list); @@ -309,14 +312,14 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils { } /** - * localDate转dateStr + * localDate转dateStr 直接 .toString() * @param localDate * @return 格式"yyyy-MM-dd" */ - public static String localDate2DateStr(LocalDate localDate) { - DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd"); - return localDate.format(df); - } + // public static String localDate2DateStr(LocalDate localDate) { + // DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd"); + // return localDate.format(df); + // } /** * Date转LocalDateTime @@ -909,7 +912,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils { } List resultList = new ArrayList<>(); localDateList.forEach(localDate -> { - String dateStr = localDate2DateStr(localDate); + String dateStr = localDate.toString(); resultList.add(dateStr); }); return resultList;