From 1d2b7c3172a9a61634de47febd845d67fcf2f417 Mon Sep 17 00:00:00 2001 From: linwei <872216696@qq.com> Date: Fri, 22 May 2026 14:23:33 +0800 Subject: [PATCH] fix(workflow): 修复工单流程阶段组装逻辑 --- drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/entity/GdPatrolTaskEntity.java | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 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 919619a..83d46ef 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,12 +16,15 @@ */ 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; import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.core.mp.base.BaseEntity; + +import org.sxkj.common.handler.StringToIntegerTypeHandler; import java.util.Date; @@ -78,11 +81,17 @@ */ @ApiModelProperty(value = "推荐飞手名称") private String recommendFlyerName; + + /** + * 设备飞手ID + */ + @ApiModelProperty(value = "设备飞手ID") + private String deviceFlyerId; /** * 关联设备ID */ @ApiModelProperty(value = "关联设备ID") - private String deviceId; + private Long deviceId; /** * 任务描述 */ @@ -92,6 +101,7 @@ * 状态：0待签收、1拒绝签收、2已撤回、3待审核、4审核驳回、5审核通过、6待验收、7拒绝验收、8验收通过 */ @ApiModelProperty(value = "状态：0待签收、1拒绝签收、2已撤回、3待审核、4审核驳回、5审核通过、6待验收、7拒绝验收、8验收通过") + @TableField(typeHandler = StringToIntegerTypeHandler.class) private String taskStatus; /** * 区域编码 -- Gitblit v1.9.3