From d2abab50172d55d2c64f5aea154adf1dcf2c1d72 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 22 十月 2024 10:12:22 +0800
Subject: [PATCH] bug修改
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 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 6b5b491..4d3a73e 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
@@ -23,6 +23,7 @@
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.BasePojo;
import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.common.core.web.domain.AjaxResult;
@@ -307,7 +308,7 @@
}
@ResponseBody
- @PostMapping(value = "/chargingOrderInfo")
+ @GetMapping(value = "/chargingOrderInfo")
@ApiOperation(value = "充电桩订单列表查看详情", tags = {"管理后台-订单管理"})
public AjaxResult<ChargingOrderInfoVO> chargingOrderInfo(String strategyId) {
TChargingOrder byId = chargingOrderService.getById(strategyId);
@@ -814,6 +815,7 @@
}
List<TChargingOrder> list = chargingOrderService.lambdaQuery().ge(TChargingOrder::getStartTime, start).le(TChargingOrder::getEndTime, end).in(TChargingOrder::getSiteId, siteIds).list();
List<Long> chargingOrderIds = list.stream().map(TChargingOrder::getId).collect(Collectors.toList());
+ chargingOrderIds.add(-1L);
//上方饼图
List<Map<String,Object>> maps = chargingOrderService.getSumByType(chargingOrderIds);
@@ -950,16 +952,18 @@
tCharingUserMapVO.setMap(dateRangeStatistics);
- List<Map<String,Object>> map1 = chargingOrderService.usersByQuery(statisticsQueryDto);
+ List<Map<String,Object>> map1 = chargingOrderService.usersByQuery1(statisticsQueryDto);
+ LocalDate startDate1 = statisticsQueryDto.getStartTime();
+ LocalDate endDate1 = statisticsQueryDto.getEndTime();
List<Map<String, Object>> dateRangeStatistics1 = new ArrayList<>();
// 遍历日期范围
- while (!startDate.isAfter(endDate)) {
- String formattedDate = startDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+ while (!startDate1.isAfter(endDate1)) {
+ String formattedDate = startDate1.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
Map<String, Object> dailyStats = findMapWithDateValue(map1, formattedDate);
if (dailyStats != null) {
@@ -972,7 +976,7 @@
}
// 移动到下一天
- startDate = startDate.plusDays(1);
+ startDate1 = startDate1.plusDays(1);
}
tCharingUserMapVO.setMap1(dateRangeStatistics1);
@@ -1156,7 +1160,7 @@
} else {
siteIds.add(statisticsQueryDto.getSiteId());
}
- List<TChargingOrder> list = chargingOrderService.lambdaQuery().in(!siteIds.isEmpty(), TChargingOrder::getSiteId, siteIds).eq(statisticsQueryDto.getSiteId() != null, TChargingOrder::getSiteId, statisticsQueryDto.getSiteId()).list();
+ List<TChargingOrder> list = chargingOrderService.lambdaQuery().in(!siteIds.isEmpty(), TChargingOrder::getSiteId, siteIds).eq(statisticsQueryDto.getSelectDate()!=null, TChargingOrder::getCreateTime,statisticsQueryDto.getSelectDate()).eq(statisticsQueryDto.getSiteId() != null, TChargingOrder::getSiteId, statisticsQueryDto.getSiteId()).list();
//当日的订单总数
int size = list.size();
//计算list中paymentAmount的总和
--
Gitblit v1.7.1