From ff2ee260472e3b43c6dfd4b1406b629dfeb2d3f4 Mon Sep 17 00:00:00 2001 From: rain <1679827795@qq.com> Date: Wed, 28 Jan 2026 19:33:04 +0800 Subject: [PATCH] 吉安航线任务推送 --- drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/entity/GdPatrolTaskEntity.java | 27 ++++++++++++++++++++++----- 1 files changed, 22 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..919619a 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 @@ -42,6 +42,12 @@ */ @ApiModelProperty(value = "关联工单任务表ID") private Long workOrderId; + + /** + * 巡查任务编号 + */ + @ApiModelProperty(value = "巡查任务编号") + private String taskNo; /** * 巡查任务名称 */ @@ -50,13 +56,18 @@ /** * 巡查任务类型（巡查类/安检类等） */ - @ApiModelProperty(value = "巡查任务类型（巡查类/安检类等）") + @ApiModelProperty(value = "巡查任务类型 1.巡查类 2.巡检类 3.安保类 4.文旅类 5.采集数据类 ") private String patrolTaskType; /** * 执行时间 */ @ApiModelProperty(value = "执行时间") private Date executeTime; + /** + * 外部来源航线Id + */ + @ApiModelProperty(value = "外部来源航线Id") + private String airlineId; /** * 巡查任务航线URL */ @@ -71,21 +82,27 @@ * 关联设备ID */ @ApiModelProperty(value = "关联设备ID") - private Long deviceId; + private String deviceId; /** * 任务描述 */ @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验收通过") + private String taskStatus; /** * 区域编码 */ @ApiModelProperty(value = "区域编码") private String areaCode; + /** + * 拒绝原因（审核拒绝时必填） + */ + @ApiModelProperty(value = "拒绝原因（审核拒绝时必填）") + private String rejectReason; + } -- Gitblit v1.9.3