From 3fa7cdec6ce44f07a0dc7e1910511ead606990f3 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 11 九月 2025 08:19:53 +0800
Subject: [PATCH] 1

---
 zy-acs-manager/src/main/resources/mapper/manager/SegmentMapper.xml |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/zy-acs-manager/src/main/resources/mapper/manager/SegmentMapper.xml b/zy-acs-manager/src/main/resources/mapper/manager/SegmentMapper.xml
index b1d1e48..7981c07 100644
--- a/zy-acs-manager/src/main/resources/mapper/manager/SegmentMapper.xml
+++ b/zy-acs-manager/src/main/resources/mapper/manager/SegmentMapper.xml
@@ -24,12 +24,20 @@
     </sql>
 
     <select id="getGroupNo" resultType="java.lang.String">
-        SELECT
-        group_id
-        FROM man_segment
-        WHERE state = #{state}
+        SELECT group_id
+        FROM (
+            SELECT group_id, create_time
+            FROM man_segment
+            WHERE state = #{state}
+            <if test="agvId != null">
+                AND agv_id = #{agvId}
+            </if>
+            <if test="groupNo != null">
+                AND group_id LIKE CONCAT('%', #{groupNo}, '%')
+            </if>
+            ORDER BY create_time DESC
+        ) a
         GROUP BY group_id
-        ORDER BY create_time DESC
     </select>
 
 </mapper>

--
Gitblit v1.9.1