From fc03f5f8be1d34080f484022153bb615bcdc8c8f Mon Sep 17 00:00:00 2001
From: xiebin <vip_xiaobin810@163.com>
Date: Wed, 21 Jan 2026 17:08:04 +0800
Subject: [PATCH] update-上报飞行成果接口-对外

---
 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/vo/GdPatrolTaskVO.java |   77 ++++++++++++++++++++++++++++++++++----
 1 files changed, 69 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..b0a319a 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,8 @@
 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;
 
 /**
  * 巡查任务表 视图实体类
@@ -28,14 +27,76 @@
  * @since 2026-01-14
  */
 @Data
-@EqualsAndHashCode(callSuper = true)
-public class GdPatrolTaskVO extends GdPatrolTaskEntity {
+public class GdPatrolTaskVO {
 	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;
+
+	/**
+	 * 关联工单任务表ID
+	 */
+	@ApiModelProperty(value = "关联工单任务表ID")
+	private Long workOrderId;
+
+	/**
+	 * 巡查任务编号
+	 */
+	@ApiModelProperty(value = "巡查任务编号")
+	private String taskNo;
+	/**
+	 * 巡查任务名称
+	 */
+	@ApiModelProperty(value = "巡查任务名称")
+	private String patrolTaskName;
+	/**
+	 * 巡查任务类型(巡查类/安检类等)
+	 */
+	@ApiModelProperty(value = "巡查任务类型 1.巡查类 2.巡检类 3.安保类 4.文旅类 5.采集数据类 ")
+	private String patrolTaskType;
+	/**
+	 * 执行时间
+	 */
+	@ApiModelProperty(value = "执行时间")
+	private Date executeTime;
+	/**
+	 * 巡查任务航线URL
+	 */
+	@ApiModelProperty(value = "巡查任务航线URL")
+	private String patrolRouteUrl;
+	/**
+	 * 推荐飞手名称
+	 */
+	@ApiModelProperty(value = "推荐飞手名称")
+	private String recommendFlyerName;
+	/**
+	 * 关联设备ID
+	 */
+	@ApiModelProperty(value = "关联设备ID")
+	private Long deviceId;
+	/**
+	 * 任务描述
+	 */
+	@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 areaCode;
+
+	@ApiModelProperty("主键id")
+	private Long id;
 
 }

--
Gitblit v1.9.3