From bc4aefe8d0a0ac6e5ef1f2e65709549c2415ed8f Mon Sep 17 00:00:00 2001 From: luodangjia <luodangjia> Date: 星期五, 11 十月 2024 14:51:40 +0800 Subject: [PATCH] 10.11 --- ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java index db7f2da..2f2117c 100644 --- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java +++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java @@ -726,16 +726,16 @@ // 获取本月1号的日期 YearMonth yearMonth = YearMonth.from(today); - start = yearMonth.atDay(1); - - System.out.println("本月1号是: " + start); +// start = yearMonth.atDay(1); +// +// System.out.println("本月1号是: " + start); }else if (statisticsQueryDto.getDayType()==4){ LocalDate today = LocalDate.now(); // 获取当前年份 int currentYear = today.getYear(); // 获取今年1月1日的日期 - start = LocalDate.of(currentYear, 1, 1); - System.out.println("今年1月1日是: " + start); + start = statisticsQueryDto.getStartTime(); + end = statisticsQueryDto.getEndTime(); }else if (statisticsQueryDto.getDayType()==5){ // 获取今年1月1日的日期 -- Gitblit v1.7.1