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 | 47 ++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 42 insertions(+), 5 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..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;
/**
* 巡查任务表 实体类
@@ -42,6 +48,12 @@
*/
@ApiModelProperty(value = "关联工单任务表ID")
private Long workOrderId;
+
+ /**
+ * 巡查任务编号
+ */
+ @ApiModelProperty(value = "巡查任务编号")
+ private String taskNo;
/**
* 巡查任务名称
*/
@@ -50,13 +62,19 @@
/**
* 巡查任务类型（巡查类/安检类等）
*/
- @ApiModelProperty(value = "巡查任务类型（巡查类/安检类等）")
- private String patrolTaskType;
+ @ApiModelProperty(value = "巡查任务类型（二维数组，如：[[\"road\",\"road1\"],[\"bridge\",\"bridge2\"]]）")
+ @TableField(value = "patrol_task_type", typeHandler = GenericListTypeHandler.class)
+ private List<List<String>> patrolTaskType;
/**
* 执行时间
*/
@ApiModelProperty(value = "执行时间")
private Date executeTime;
+ /**
+ * 外部来源航线Id
+ */
+ @ApiModelProperty(value = "外部来源航线Id")
+ private String airlineId;
/**
* 巡查任务航线URL
*/
@@ -67,6 +85,18 @@
*/
@ApiModelProperty(value = "推荐飞手名称")
private String recommendFlyerName;
+
+ /**
+ * 设备飞手ID
+ */
+ @ApiModelProperty(value = "设备飞手ID")
+ private String deviceFlyerId;
+
+ // 算法 algorithmIds
+ @ApiModelProperty("算法ids")
+ @TableField(typeHandler = ListToStringTypeHandler.class)
+ private List<String> algorithmIds;
+
/**
* 关联设备ID
*/
@@ -78,14 +108,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