From 780850b50948929e33bf4750f9b43e0d26312b04 Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期五, 01 十一月 2024 11:54:44 +0800 Subject: [PATCH] 合并代码 --- ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java index 0593bb3..c6ed1b2 100644 --- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java +++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java @@ -18,6 +18,7 @@ import com.ruoyi.order.dto.*; import com.ruoyi.order.vo.ChargingOrderListInfoVO; import com.ruoyi.order.vo.EndOfChargePageInfo; +import org.springframework.web.bind.annotation.RequestBody; import java.time.LocalDate; import java.util.List; @@ -197,6 +198,7 @@ List<Map<String, Object>> usersDay1(); List<Map<String, Object>> usersByQuery(ChargingStatisticsQueryDto statisticsQueryDto); + List<Map<String, Object>> usersByQuery1(ChargingStatisticsQueryDto statisticsQueryDto); List<Map<String, Object>> getUserTagCount(); @@ -211,7 +213,7 @@ Map<String, Object> countLocalCar(); - Long getAver(List<Integer> siteIds); + Double getAver(List<Integer> siteIds); List<Map<String, Object>> getLevelEvaluate(List<Integer> siteIds); @@ -265,4 +267,16 @@ * @return */ EndOfChargePageInfo getEndOfChargePageInfo(String id); + + Long countNoTag(); + + + /** + * 获取订单数据 + * @param order + * @return + */ + List<TChargingOrder> getChargingOrder(TChargingOrderVo order); + + Long countCar(List<String> brands); } -- Gitblit v1.7.1