From 3a1787f8b3e48522e31710f20cfbac3d43a4c90f Mon Sep 17 00:00:00 2001 From: chenlong Date: Thu, 23 Jan 2025 11:47:18 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E9=80=81=E7=9A=84=E6=80=BB=E8=AE=A1?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=BD=93=E6=9C=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/largeScreen/impl/DeliveryDataServiceImpl.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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);