From ae60b39f1040fd04c0d0d5f9c04faae4ce5e267d Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 19 八月 2026 17:37:35 +0800
Subject: [PATCH] feat: include stopped charging orders (status 4) in battery safety detection stats
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java | 2 +-
ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml | 2 +-
2 files changed, 2 insertions(+), 2 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 7cb8d9f..2317404 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
@@ -7810,7 +7810,7 @@
for (List<Integer> chunk : chunkList(gunIds, 500)) {
Long chunkCount = this.baseMapper.selectCount(new LambdaQueryWrapper<TChargingOrder>()
.eq(TChargingOrder::getDelFlag, 0)//未删除
- .in(TChargingOrder::getStatus, Arrays.asList(3, 5))//充电中、已结束
+ .in(TChargingOrder::getStatus, Arrays.asList(3, 4, 5))//充电中、停止中、已结束
.in(TChargingOrder::getChargingGunId, chunk));//符合条件的充电枪
total += chunkCount == null ? 0L : chunkCount;
}
diff --git a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml
index fcb74db..7da4edb 100644
--- a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml
+++ b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml
@@ -2846,7 +2846,7 @@
SELECT COUNT(1)
FROM t_charging_order
WHERE del_flag = 0
- AND status IN (3, 5)
+ AND status IN (3, 4, 5)
AND charging_gun_id IN
<foreach item="item" index="index" collection="gunIds" open="(" separator="," close=")">
#{item}
--
Gitblit v1.7.1