From 8b79bbbeae1723b3135949b3e9b4ed1c3dbdf6f0 Mon Sep 17 00:00:00 2001
From: longz <longzhaoz@qq.com>
Date: 星期三, 05 八月 2026 14:14:41 +0800
Subject: [PATCH] fix: preserve franchise operation date semantics
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 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 371dc95..e721394 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
@@ -327,9 +327,13 @@
List<Integer> siteIds = franchiseeSiteIds(params);
LocalDateTime[] range = franchiseeRange(params);
ChargingStatisticsQueryDto query = new ChargingStatisticsQueryDto();
- query.setDayType(5);
- query.setStartTime(range[0].toLocalDate());
- query.setEndTime(range[1].toLocalDate().minusDays(1));
+ String dateType = params == null ? "today" : String.valueOf(params.getOrDefault("dateType", "today"));
+ int dayType = "week".equals(dateType) ? 2 : "month".equals(dateType) ? 3 : "year".equals(dateType) ? 4 : "custom".equals(dateType) ? 5 : 1;
+ query.setDayType(dayType);
+ if (dayType == 5) {
+ query.setStartTime(range[0].toLocalDate());
+ query.setEndTime(range[1].toLocalDate().minusDays(1));
+ }
List<Map<String, Object>> dcAvailable = safeList(chargingOrderService.equipmentUserType1(siteIds, query));
List<Map<String, Object>> acAvailable = safeList(chargingOrderService.equipmentUserType2(siteIds, query));
--
Gitblit v1.7.1