diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/impl/DeliveryDataServiceImpl.java b/blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/impl/DeliveryDataServiceImpl.java index 6c377e7dc..c2e45910d 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/impl/DeliveryDataServiceImpl.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/impl/DeliveryDataServiceImpl.java @@ -23,8 +23,12 @@ public class DeliveryDataServiceImpl implements IDeliveryDataService { public DeliveryDataVO getDeliveryAllData(Integer isYear) { DeliveryDataVO deliveryDataVO = new DeliveryDataVO(); - String startTime = isYear.equals(1) ? LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-01-01 00:00:00")) : null; - String endTime = isYear.equals(1) ? LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-12-31 23:59:59")) : null; + String startTime = isYear.equals(1) + ? LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-01-01 00:00:00")) + : LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-01 00:00:00")) ; + String endTime = isYear.equals(1) + ? LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-12-31 23:59:59")) + : LocalDateTime.now().plusMonths(1).format(DateTimeFormatter.ofPattern("yyyy-MM-01 00:00:00")); DeliveryDataVO deliveryAllData = deliveryDataMapper.getDeliveryAllData(startTime, endTime); DeliveryDataVO delivery2CData = deliveryDataMapper.getDelivery2CData(startTime, endTime);