From 37bd67b3e4df5651173efc03c8f39afd5521e401 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 07 一月 2025 16:55:05 +0800
Subject: [PATCH] 修改出账期

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChargingBillController.java |   15 +++++----------
 1 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChargingBillController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChargingBillController.java
index 2f1c19e..6c2f211 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChargingBillController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChargingBillController.java
@@ -343,23 +343,18 @@
             chargingBillExport.setSiteName(data.get(0).getName());
         }
 //        // 根据账单的出账时间 查询上个月的充电订单
-//        LocalDateTime localDate = byId.getBillTime().minusMonths(1);
+        LocalDateTime localDate = byId.getBillTime().minusMonths(1);
 //        // 账单周期
 //        // 获取 LocalDate 对象
 //        LocalDate date = localDate.toLocalDate();
 //        // 获取该月份的第一天
 //        LocalDate firstDayOfMonth = date.withDayOfMonth(1);
-         LocalDateTime localDate = byId.getBillTime().minusDays(1);
-        // todo 临时修改为前一天
         // 获取 LocalDate 对象
         LocalDate date = localDate.toLocalDate();
-//            // 获取该月份的第一天
-//            LocalDate firstDayOfMonth = date.withDayOfMonth(1);
-//            // 获取该月份的最后一天
-//            LocalDate lastDayOfMonth = date.with(TemporalAdjusters.lastDayOfMonth());
-        // todo 临时修改为查询昨天凌晨00:00:00 到 23:59:59
-        LocalDateTime firstDayOfMonth = LocalDateTime.of(date, LocalTime.MIN);
-        LocalDateTime lastDayOfMonth = LocalDateTime.of(date, LocalTime.MAX);
+            // 获取该月份的第一天
+            LocalDate firstDayOfMonth = date.withDayOfMonth(1);
+            // 获取该月份的最后一天
+            LocalDate lastDayOfMonth = date.with(TemporalAdjusters.lastDayOfMonth());
         // 获取该月份的最后一天
 //        LocalDate lastDayOfMonth = date.with(TemporalAdjusters.lastDayOfMonth());
         QueryWrapper<TChargingOrder> eq = new QueryWrapper<TChargingOrder>()

--
Gitblit v1.7.1