From caf9d837bc7b2bb6de6b7ba0aac72c3ab7ae93a8 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 05 Aug 2026 11:19:31 +0800
Subject: [PATCH] fix(workorder): 修复管理员查询状态列表权限问题
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/vo/GdPatrolTaskVO.java | 139 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 131 insertions(+), 8 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 fd488f1..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
@@ -17,9 +17,13 @@
package org.sxkj.gd.workorder.vo;
import io.swagger.annotations.ApiModelProperty;
-import org.sxkj.gd.workorder.entity.GdPatrolTaskEntity;
import lombok.Data;
-import lombok.EqualsAndHashCode;
+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;
/**
* 巡查任务表 视图实体类
@@ -28,14 +32,133 @@
* @since 2026-01-14
*/
@Data
-@EqualsAndHashCode(callSuper = true)
-public class GdPatrolTaskVO extends GdPatrolTaskEntity {
+public class GdPatrolTaskVO implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "开始时间")
- private String startTime;
+ @ApiModelProperty(value = "成果数量")
+ private Long resultCount;
- @ApiModelProperty(value = "结束时间")
- private String endTime;
+ @ApiModelProperty(value = "问题事件数量")
+ private Long issueEventCount;
+
+ @ApiModelProperty(value = "工单名称")
+ private String workOrderName;
+
+ @ApiModelProperty(value = "工单状态")
+ private String workOrderStatus;
+
+ /**
+ * 关联工单任务表ID
+ */
+ @ApiModelProperty(value = "关联工单任务表ID")
+ private Long workOrderId;
+
+ /**
+ * 巡查任务编号
+ */
+ @ApiModelProperty(value = "巡查任务编号")
+ private String taskNo;
+ /**
+ * 巡查任务名称
+ */
+ @ApiModelProperty(value = "巡查任务名称")
+ private String patrolTaskName;
+ /**
+ * 巡查任务类型（巡查类/安检类等）
+ */
+ @ApiModelProperty(value = "巡查任务类型（二维数组，如：[[\"road\",\"road1\"],[\"bridge\",\"bridge2\"]]）")
+ private List<List<String>> patrolTaskType;
+ /**
+ * 执行时间
+ */
+ @ApiModelProperty(value = "执行时间")
+ private Date executeTime;
+
+ @ApiModelProperty(value = "巡查任务航线ID")
+ private String airlineId;
+
+ /**
+ * 巡查任务航线URL
+ */
+ @ApiModelProperty(value = "巡查任务航线URL")
+ private String patrolRouteUrl;
+ /**
+ * 推荐飞手名称
+ */
+ @ApiModelProperty(value = "推荐飞手名称")
+ private String recommendFlyerName;
+
+ @ApiModelProperty(value = "设备飞手ID")
+ private String deviceFlyerId;
+ /**
+ * 关联设备ID
+ */
+ @ApiModelProperty(value = "关联设备ID")
+ private Long deviceId;
+
+ @ApiModelProperty(value = "设备名称")
+ private String deviceName;
+ /**
+ * 任务描述
+ */
+ @ApiModelProperty(value = "任务描述")
+ private String taskDesc;
+ /**
+ * 状态：0待签收、1拒绝签收、2已撤回、3待审核、4审核驳回、5审核通过、6待验收、7拒绝验收、8验收通过
+ */
+ @ApiModelProperty(value = "状态：0待签收、1拒绝签收、2已撤回、3待审核、4审核驳回、5审核通过、6待验收、7拒绝验收、8验收通过")
+ private String taskStatus;
+
+ /**
+ * 拒绝原因（审核拒绝时必填）
+ */
+ @ApiModelProperty(value = "拒绝原因（审核拒绝时必填）")
+ private String rejectReason;
+
+ /**
+ * 区域编码
+ */
+ @ApiModelProperty(value = "区域编码")
+ private String areaCode;
+
+ @ApiModelProperty("主键id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty(value = "创建人")
+ private Long createUser;
+
+ @ApiModelProperty(value = "创建部门")
+ private Long createDept;
+
+ @ApiModelProperty(value = "创建时间")
+ private Date createTime;
+
+ @ApiModelProperty(value = "更新人")
+ private Long updateUser;
+
+ @ApiModelProperty(value = "更新时间")
+ private Date updateTime;
+
+ @ApiModelProperty(value = "状态")
+ private Integer status;
+
+ @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