From fce696c504c3772edb08e52fca12b5e3446f2980 Mon Sep 17 00:00:00 2001
From: cbs <18617195505@163.com>
Date: Mon, 31 Mar 2025 14:25:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=98=B6=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/robot/detail/RobotTaskDetailLogResoVO.java        | 3 +++
 .../controller/admin/robot/detail/RobotTaskDetailLogVO.java | 3 +++
 .../src/main/resources/mapper/robot/RobotTaskMapper.xml     | 6 +++++-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/robot/detail/RobotTaskDetailLogResoVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/robot/detail/RobotTaskDetailLogResoVO.java
index 5c26ef749..f7aecf0ef 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/robot/detail/RobotTaskDetailLogResoVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/robot/detail/RobotTaskDetailLogResoVO.java
@@ -38,4 +38,7 @@ public class RobotTaskDetailLogResoVO {
     @Schema(description = "计算后的来源库位编号")
     private String fromLocationNo;
 
+    @Schema(description = "任务阶段(0:待执行、1：前往取货、2：取货中、3：前往放货、4：放货中、5：结束、6：移动中、7:正在充电、8:取消、9:人工完成、10:异常)")
+    private Long taskStage;
+
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/robot/detail/RobotTaskDetailLogVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/robot/detail/RobotTaskDetailLogVO.java
index 5a95b3720..e2454183c 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/robot/detail/RobotTaskDetailLogVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/robot/detail/RobotTaskDetailLogVO.java
@@ -30,4 +30,7 @@ public class RobotTaskDetailLogVO extends PageParam {
 
     @Schema(description = "关键词")
     private String msg;
+
+    @Schema(description = "任务阶段(0:待执行、1：前往取货、2：取货中、3：前往放货、4：放货中、5：结束、6：移动中、7:正在充电、8:取消、9:人工完成、10:异常)")
+    private Long taskStage;
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/robot/RobotTaskMapper.xml b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/robot/RobotTaskMapper.xml
index 01cb3707c..4a010977b 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/robot/RobotTaskMapper.xml
+++ b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/robot/RobotTaskMapper.xml
@@ -299,7 +299,8 @@
             t2.start_time as startTime,
             t2.end_time as endTime,
             t2.from_location_no as fromLocationNo,
-            t2.to_location_no as toLocationNo
+            t2.to_location_no as toLocationNo,
+            t2.task_stage as taskStage
         from
             robot_task t1 inner join  robot_task_detail t2
         on t1.id = t2.robot_task_id
@@ -324,6 +325,9 @@
             <if test="pageReqVO.endTime!=null ">
                 AND t1.create_time &lt;= #{pageReqVO.endTime}
             </if>
+            <if test="pageReqVO.taskStage != null">
+                and t2.task_stage = #{pageReqVO.taskStage}
+            </if>
         </where>
         order by t1.create_time desc
     </select>