From 071cd79b24a943ba764448adc07c416bb55ca3ba Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 05 Aug 2026 10:53:18 +0800
Subject: [PATCH] fix(gd): 移除用户部门关联查询中的软删除条件
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/vo/GdPatrolTaskVO.java | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/vo/GdPatrolTaskVO.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/vo/GdPatrolTaskVO.java
index 7d1383a..2e7925c 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/vo/GdPatrolTaskVO.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/vo/GdPatrolTaskVO.java
@@ -20,6 +20,8 @@
import lombok.Data;
import java.util.Date;
import java.io.Serializable;
+import java.util.List;
+
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -42,6 +44,9 @@
@ApiModelProperty(value = "工单名称")
private String workOrderName;
+ @ApiModelProperty(value = "工单状态")
+ private String workOrderStatus;
+
/**
* 关联工单任务表ID
*/
@@ -61,8 +66,8 @@
/**
* 巡查任务类型（巡查类/安检类等）
*/
- @ApiModelProperty(value = "巡查任务类型 1.巡查类 2.巡检类 3.安保类 4.文旅类 5.采集数据类 ")
- private String patrolTaskType;
+ @ApiModelProperty(value = "巡查任务类型（二维数组，如：[[\"road\",\"road1\"],[\"bridge\",\"bridge2\"]]）")
+ private List<List<String>> patrolTaskType;
/**
* 执行时间
*/
@@ -82,6 +87,9 @@
*/
@ApiModelProperty(value = "推荐飞手名称")
private String recommendFlyerName;
+
+ @ApiModelProperty(value = "设备飞手ID")
+ private String deviceFlyerId;
/**
* 关联设备ID
*/
@@ -138,4 +146,19 @@
@ApiModelProperty(value = "逻辑删除")
private Integer isDeleted;
+ @ApiModelProperty(value = "机场id")
+ private String airportId;
+
+ @ApiModelProperty(value = "高度")
+ private String height;
+
+ @ApiModelProperty(value = "经度")
+ private String longitude;
+
+ @ApiModelProperty(value = "纬度")
+ private String latitude;
+
+ @ApiModelProperty("算法ids")
+ private List<String> algorithmIds;
+
}
--
Gitblit v1.9.3