From ebeb43ea497fafc448c827d1de6796bcaa4e0b52 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 23 Jun 2026 13:59:46 +0800
Subject: [PATCH] add : 吉安支持查询待验收的接口

---
 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/entity/GdPatrolTaskEntity.java |   26 +++++++++++++++++++++++---
 1 files changed, 23 insertions(+), 3 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 919619a..64b0b9f 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,6 +16,7 @@
  */
 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;
@@ -23,7 +24,12 @@
 import lombok.EqualsAndHashCode;
 import org.springblade.core.mp.base.BaseEntity;
 
+import org.sxkj.common.handler.ListToStringTypeHandler;
+import org.sxkj.common.handler.GenericListTypeHandler;
+import org.sxkj.common.handler.StringToIntegerTypeHandler;
+
 import java.util.Date;
+import java.util.List;
 
 /**
  * 巡查任务表 实体类
@@ -56,8 +62,9 @@
 	/**
 	 * 巡查任务类型(巡查类/安检类等)
 	 */
-	@ApiModelProperty(value = "巡查任务类型 1.巡查类 2.巡检类 3.安保类 4.文旅类 5.采集数据类 ")
-	private String patrolTaskType;
+	@ApiModelProperty(value = "巡查任务类型(二维数组,如:[[\"road\",\"road1\"],[\"bridge\",\"bridge2\"]])")
+	@TableField(value = "patrol_task_type", typeHandler = GenericListTypeHandler.class)
+	private List<List<String>> patrolTaskType;
 	/**
 	 * 执行时间
 	 */
@@ -78,11 +85,23 @@
 	 */
 	@ApiModelProperty(value = "推荐飞手名称")
 	private String recommendFlyerName;
+
+	/**
+	 * 设备飞手ID
+	 */
+	@ApiModelProperty(value = "设备飞手ID")
+	private String deviceFlyerId;
+
+	// 算法 algorithmIds
+	@ApiModelProperty("算法ids")
+	@TableField(typeHandler = ListToStringTypeHandler.class)
+	private List<String> algorithmIds;
+
 	/**
 	 * 关联设备ID
 	 */
 	@ApiModelProperty(value = "关联设备ID")
-	private String deviceId;
+	private Long deviceId;
 	/**
 	 * 任务描述
 	 */
@@ -92,6 +111,7 @@
 	 * 状态:0待签收、1拒绝签收、2已撤回、3待审核、4审核驳回、5审核通过、6待验收、7拒绝验收、8验收通过
 	 */
 	@ApiModelProperty(value = "状态:0待签收、1拒绝签收、2已撤回、3待审核、4审核驳回、5审核通过、6待验收、7拒绝验收、8验收通过")
+	@TableField(typeHandler = StringToIntegerTypeHandler.class)
 	private String taskStatus;
 	/**
 	 * 区域编码

--
Gitblit v1.9.3