From bea6be45135924d9218553fdb9f366caabfb9659 Mon Sep 17 00:00:00 2001
From: RnhaiWang <393727820@qq.com>
Date: Tue, 21 May 2024 15:27:56 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E8=B7=AF=E7=BA=BF=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/hnac/hzinfo/inspect/task/entity/TaskEntity.java | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskEntity.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskEntity.java
index df18dbe..6cd2907 100644
--- a/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskEntity.java
+++ b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskEntity.java
@@ -48,6 +48,14 @@ public class TaskEntity extends TenantEntity {
 	@ApiModelProperty(value = "计划名称")
 	@QueryField(condition = SqlCondition.LIKE)
 	private String planName;
+
+	/**
+	 * 路线名称
+	 */
+	@ApiModelProperty(value = "路线名称")
+	@QueryField(condition = SqlCondition.LIKE)
+	private String routeName;
+
 	/**
 	 * 任务批次号
 	 */

From c7a3b8bf7332ad426561bb130b33f0965f7225c2 Mon Sep 17 00:00:00 2001
From: RnhaiWang <393727820@qq.com>
Date: Tue, 21 May 2024 17:24:23 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E8=B7=AF=E7=BA=BF=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/hnac/hzinfo/inspect/ai/service/impl/RobotTaskServiceImpl.java | 1 +
 .../java/com/hnac/hzinfo/inspect/ai/vo/robot/RobotTaskTransParam.java | 4 ++++
 .../java/com/hnac/hzinfo/inspect/task/job/service/TaskJobService.java | 1 +
 3 files changed, 6 insertions(+)

diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/impl/RobotTaskServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/impl/RobotTaskServiceImpl.java
index e2912b5..1ec39a8 100644
--- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/impl/RobotTaskServiceImpl.java
+++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/impl/RobotTaskServiceImpl.java
@@ -236,6 +236,7 @@ public class RobotTaskServiceImpl extends BaseServiceImpl<RobotTaskMapper, Robot
 				RobotTaskTransParam transParam = new RobotTaskTransParam();
 				transParam.setTaskId(taskvo.getId());
 				transParam.setName(taskvo.getPlanName());
+				transParam.setRouteName(taskvo.getRouteName());
 				transParam.setStatus(taskvo.getStatus());
 				transParam.setStartTime(taskvo.getPlanStartTime());
 				transParam.setEndTime(taskvo.getPlanEndTime());
diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/vo/robot/RobotTaskTransParam.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/vo/robot/RobotTaskTransParam.java
index 0b41c77..175c475 100644
--- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/vo/robot/RobotTaskTransParam.java
+++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/vo/robot/RobotTaskTransParam.java
@@ -28,6 +28,10 @@ public class RobotTaskTransParam {
 	@ApiModelProperty(value = "任务名称")
 	private String name;
 
+
+	@ApiModelProperty(value = "巡检路线")
+	private String routeName;
+
 	/**
 	 * 任务状态
 	 * 0未开始 1进行中 2暂停 3已完成 4未完成,  程序只会返回以下状态任务： 0未开始 1进行中 2暂停
diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/job/service/TaskJobService.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/job/service/TaskJobService.java
index b5311ca..1aef839 100644
--- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/job/service/TaskJobService.java
+++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/job/service/TaskJobService.java
@@ -400,6 +400,7 @@ public class TaskJobService {
         task.setDutyId(plan.getDutyId());
         task.setPlanId(plan.getId());
         task.setPlanName(plan.getName());
+        task.setRouteName(plan.getRouteName());
         task.setType(plan.getType());
         task.setCycle(plan.getCycle());
 		if(PlanCycleEnum.NEVER_CYCLE.getCycle().equals(plan.getCycle())) {