From 1c00a6204f96c1de50ec961470ecc6bbbf5bb433 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期一, 02 二月 2026 13:59:53 +0800
Subject: [PATCH] #

---
 zy-acs-manager/src/main/resources/mapper/manager/StaReserveMapper.xml |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/zy-acs-manager/src/main/resources/mapper/manager/StaReserveMapper.xml b/zy-acs-manager/src/main/resources/mapper/manager/StaReserveMapper.xml
index bbc3c31..b18a435 100644
--- a/zy-acs-manager/src/main/resources/mapper/manager/StaReserveMapper.xml
+++ b/zy-acs-manager/src/main/resources/mapper/manager/StaReserveMapper.xml
@@ -13,21 +13,33 @@
         AND type = #{type}
         AND deleted = 0
         AND status = 1
---           AND state IN ('WAITING','RESERVED')
     </update>
 
     <update id="updateStateToWaiting">
         UPDATE man_sta_reserve
         SET state = #{state},
+            segment_id = #{segmentId},
             waiting_at = IFNULL(waiting_at, NOW()),
-            expire_time = DATE_ADD(NOW(), INTERVAL #{extendMs} MILLISECOND),
+            expire_time = DATE_ADD(NOW(), INTERVAL #{extendMs} SECOND),
             update_time = NOW()
         WHERE task_id = #{taskId}
         AND sta_id = #{staId}
         AND type = #{type}
         AND deleted = 0
         AND status = 1
---         AND state IN ('RESERVED','WAITING')
+    </update>
+
+    <update id="updateStateBackToWaiting">
+        UPDATE man_sta_reserve
+        SET state = #{state},
+            segment_id = null,
+            expire_time = DATE_ADD(NOW(), INTERVAL #{extendMs} SECOND),
+            update_time = NOW()
+        WHERE task_id = #{taskId}
+        AND sta_id = #{staId}
+        AND type = #{type}
+        AND deleted = 0
+        AND status = 1
     </update>
 
 </mapper>

--
Gitblit v1.9.1