From 1159c4ef3606f50fecdacb8933efe24efac01e88 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 21 May 2026 18:52:14 +0800
Subject: [PATCH] feat(workorder): 添加设备飞手ID字段支持

---
 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/entity/GdPatrolTaskEntity.java |   35 +++++++++++++++++++++++++++++++----
 1 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/entity/GdPatrolTaskEntity.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/entity/GdPatrolTaskEntity.java
index abaa219..83d46ef 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/entity/GdPatrolTaskEntity.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/entity/GdPatrolTaskEntity.java
@@ -16,12 +16,15 @@
  */
 package org.sxkj.gd.workorder.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.mp.base.BaseEntity;
+
+import org.sxkj.common.handler.StringToIntegerTypeHandler;
 
 import java.util.Date;
 
@@ -42,6 +45,12 @@
 	 */
 	@ApiModelProperty(value = "关联工单任务表ID")
 	private Long workOrderId;
+
+	/**
+	 * 巡查任务编号
+	 */
+	@ApiModelProperty(value = "巡查任务编号")
+	private String taskNo;
 	/**
 	 * 巡查任务名称
 	 */
@@ -50,13 +59,18 @@
 	/**
 	 * 巡查任务类型（巡查类/安检类等）
 	 */
-	@ApiModelProperty(value = "巡查任务类型（巡查类/安检类等）")
+	@ApiModelProperty(value = "巡查任务类型 1.巡查类 2.巡检类 3.安保类 4.文旅类 5.采集数据类 ")
 	private String patrolTaskType;
 	/**
 	 * 执行时间
 	 */
 	@ApiModelProperty(value = "执行时间")
 	private Date executeTime;
+	/**
+	 * 外部来源航线Id
+	 */
+	@ApiModelProperty(value = "外部来源航线Id")
+	private String airlineId;
 	/**
 	 * 巡查任务航线URL
 	 */
@@ -67,6 +81,12 @@
 	 */
 	@ApiModelProperty(value = "推荐飞手名称")
 	private String recommendFlyerName;
+
+	/**
+	 * 设备飞手ID
+	 */
+	@ApiModelProperty(value = "设备飞手ID")
+	private String deviceFlyerId;
 	/**
 	 * 关联设备ID
 	 */
@@ -78,14 +98,21 @@
 	@ApiModelProperty(value = "任务描述")
 	private String taskDesc;
 	/**
-	 * 状态：0草稿、1待签收、2拒绝签收、3待审核
+	 * 状态：0待签收、1拒绝签收、2已撤回、3待审核、4审核驳回、5审核通过、6待验收、7拒绝验收、8验收通过
 	 */
-	@ApiModelProperty(value = "状态：0草稿、1待签收、2拒绝签收、3待审核")
-	private Byte taskStatus;
+	@ApiModelProperty(value = "状态：0待签收、1拒绝签收、2已撤回、3待审核、4审核驳回、5审核通过、6待验收、7拒绝验收、8验收通过")
+	@TableField(typeHandler = StringToIntegerTypeHandler.class)
+	private String taskStatus;
 	/**
 	 * 区域编码
 	 */
 	@ApiModelProperty(value = "区域编码")
 	private String areaCode;
 
+	/**
+	 * 拒绝原因（审核拒绝时必填）
+	 */
+	@ApiModelProperty(value = "拒绝原因（审核拒绝时必填）")
+	private String rejectReason;
+
 }

--
Gitblit v1.9.3