From 6fd8773f526a2e4bee8bf0b41b55cba3892b451b Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 29 五月 2025 16:51:32 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile into dev
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
index 4fd1554..95be317 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
@@ -4097,7 +4097,8 @@
LocalDateTime endDate = today.minusDays(1).atTime(LocalTime.MAX);
// 查询数据库
List<OrderCountByDate> orderCounts = this.baseMapper.countOrdersByDate(startDate, endDate, gunIds);*/
- // 转换结果
+
+
List<LocalDate> dates = new ArrayList<>();
List<Integer> counts = new ArrayList<>();
LocalDate today = LocalDate.now();
@@ -4113,7 +4114,7 @@
.eq(TChargingOrder::getDelFlag,0)//未删除
.in(TChargingOrder::getStatus,Arrays.asList(3,5))//充电中、已结束
.in(TChargingOrder::getChargingGunId,gunIds)//符合条件的充电枪 站点 超充快充
- .between(BasePojo::getCreateTime,startOfDay,endOfDay));//每天
+ .between(TChargingOrder::getCreateTime,startOfDay,endOfDay));//每天
}
dates.add(day);
counts.add(count.intValue());
@@ -4122,7 +4123,6 @@
vo.setCounts(counts);
return R.ok(vo);
}
-
@Override
public BigDecimal getSumDegreeBySiteIds(List<Integer> siteIds) {
--
Gitblit v1.7.1