From d2bcfe23e62a7da8f0ea87d27f2fadc01db69653 Mon Sep 17 00:00:00 2001
From: lingyunxsh <lingyunxsh@gmail.com>
Date: Sat, 31 May 2025 18:20:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=94=A8=E6=88=B7=E5=85=85?=
 =?UTF-8?q?=E7=94=B5=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ChargingSessionServiceImpl.java      | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/springboot-init-main/src/main/java/com/yupi/project/service/impl/ChargingSessionServiceImpl.java b/springboot-init-main/src/main/java/com/yupi/project/service/impl/ChargingSessionServiceImpl.java
index 841117a..f7daf0b 100644
--- a/springboot-init-main/src/main/java/com/yupi/project/service/impl/ChargingSessionServiceImpl.java
+++ b/springboot-init-main/src/main/java/com/yupi/project/service/impl/ChargingSessionServiceImpl.java
@@ -577,8 +577,15 @@ public class ChargingSessionServiceImpl extends ServiceImpl<ChargingSessionMappe
         }
         QueryWrapper<ChargingSession> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("user_id", userId);
-        queryWrapper.eq("status", ChargingSessionStatusEnum.CHARGING_STARTED.getValue());
-        // 通常一个用户只有一个正在进行的会话，但为了严谨可以取最新的一个（如果有多条脏数据）
+        // 扩大活动会话状态的定义，以便用户能看到早期状态
+        List<String> activeStatuses = Arrays.asList(
+                ChargingSessionStatusEnum.REQUESTED.getValue(),
+                ChargingSessionStatusEnum.ROBOT_ASSIGNED.getValue(),
+                ChargingSessionStatusEnum.ROBOT_EN_ROUTE.getValue(), // 假设此状态会被使用
+                ChargingSessionStatusEnum.ROBOT_ARRIVED.getValue(),   // 假设此状态会被使用
+                ChargingSessionStatusEnum.CHARGING_STARTED.getValue()
+        );
+        queryWrapper.in("status", activeStatuses);
         queryWrapper.orderByDesc("create_time"); 
         queryWrapper.last("LIMIT 1");
         return this.getOne(queryWrapper);