From 44c097df8edb062e2438c95cf626f48dcfe7fe83 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 05 Aug 2026 10:46:09 +0800
Subject: [PATCH] fix(gd): 修复线索事件查询中的任务结果关联问题
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/vo/GdWorkOrderFlowVO.java | 38 ++++++++++++++++++++++++++++++++++++--
1 files changed, 36 insertions(+), 2 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/vo/GdWorkOrderFlowVO.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/vo/GdWorkOrderFlowVO.java
index 379e782..c0c931e 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/vo/GdWorkOrderFlowVO.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/vo/GdWorkOrderFlowVO.java
@@ -16,6 +16,11 @@
*/
package org.sxkj.gd.workorder.vo;
+import java.io.Serializable;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
import org.sxkj.gd.workorder.entity.GdWorkOrderFlowEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -27,8 +32,37 @@
* @since 2026-01-14
*/
@Data
-@EqualsAndHashCode(callSuper = true)
-public class GdWorkOrderFlowVO extends GdWorkOrderFlowEntity {
+public class GdWorkOrderFlowVO implements Serializable {
private static final long serialVersionUID = 1L;
+ /**
+ * 流转名称
+ */
+ @ApiModelProperty(value = "流转名称")
+ private String flowName;
+ /**
+ * 流转描述
+ */
+ @ApiModelProperty(value = "流转描述")
+ private String flowDesc;
+ /**
+ * 关联工单任务表ID/巡查任务ID
+ */
+ @ApiModelProperty(value = "关联工单任务表ID/巡查任务ID")
+ private Long workOrderId;
+ /**
+ * 操作人
+ */
+ @ApiModelProperty(value = "操作人")
+ private String operator;
+ /**
+ * 类型（0工单任务 1巡查任务）
+ */
+ @ApiModelProperty(value = "类型（0工单任务 1巡查任务）")
+ private String type;
+
+ // 创建时间
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createTime;
}
--
Gitblit v1.9.3