From f6125b320b78b36c439e85d926cb2b11cd71fc6c Mon Sep 17 00:00:00 2001 From: zhibing.pu <393733352@qq.com> Date: 星期六, 31 八月 2024 17:45:52 +0800 Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile --- ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 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 efd2b30..3575abe 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 @@ -2,6 +2,8 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.dto.ChargingOrderGroup; +import com.ruoyi.common.core.dto.ChargingPercentProvinceDto; import com.ruoyi.common.core.web.domain.AjaxResult; import com.ruoyi.common.core.web.page.BasePage; import com.ruoyi.common.core.web.page.PageInfo; @@ -15,6 +17,8 @@ import com.ruoyi.order.dto.*; import org.springframework.web.bind.annotation.RequestBody; +import java.math.BigDecimal; +import java.time.LocalDate; import java.util.List; import java.util.Map; @@ -105,6 +109,24 @@ R<PageInfo<TChargingOrderRefund>> getRefundList(ChargingRefundDto chargingRefundDto); + List<ChargingOrderGroup> chargingOrderGroup(ChargingPercentProvinceDto chargingPercentProvinceDto); + + List<SixChargingDto> charge(LocalDate sixBefore, List<Integer> siteIds); + + List<SixCircleDto> circle(List<Integer> siteIds,LocalDate sixBefore); + + Map<String, BigDecimal> countAll(LocalDate sixBefore); + + List<Map<String, BigDecimal>> getSumByType(List<Long> chargingOrderIds); + + List<Map<String, BigDecimal>> getDateData(List<Long> chargingOrderIds); + + List<Map<String, BigDecimal>> getWeekData(List<Long> chargingOrderIds); + + List<Map<String, BigDecimal>> getMonthData(List<Long> chargingOrderIds); + + List<Map<String, BigDecimal>> getYearData(List<Long> chargingOrderIds); + ChargingOrderTimeVO chargingList(ChargingListQuery dto); -- Gitblit v1.7.1