From c4664502dfdaffff555b532e65b51a57ac8b29c2 Mon Sep 17 00:00:00 2001 From: Pu Zhibing <393733352@qq.com> Date: 星期三, 16 十月 2024 17:51:32 +0800 Subject: [PATCH] 合并代码 --- ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderAccountingStrategyService.java | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderAccountingStrategyService.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderAccountingStrategyService.java index 5d97634..576ce36 100644 --- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderAccountingStrategyService.java +++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderAccountingStrategyService.java @@ -2,9 +2,11 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.order.api.model.TChargingOrderAccountingStrategy; +import org.springframework.web.bind.annotation.PathVariable; import java.util.List; import java.util.Map; +import java.util.Set; /** * <p> @@ -21,6 +23,13 @@ * @param days 天数 * @return */ - List<List<Map<String, Object>>> getTotalElectricQuantity(Integer days); + List<List<Map<String, Object>>> getTotalElectricQuantity(Integer days, Set<Integer> siteIds); + + /** + * 获取给定天数每天的充电度数 + * @param days 天数 + * @return + */ + List<Double> getDailyChargingDegree(Integer days, Set<Integer> siteIds); } -- Gitblit v1.7.1