From 08ddfad4530a014094c06fe68b8c2d9a0753403a Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 05 Aug 2026 14:09:29 +0800
Subject: [PATCH] fix(gd): 修复线索事件查询中的SQL语法错误
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/dto/GdWorkOrderFlowDTO.java | 47 ++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 42 insertions(+), 5 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/dto/GdWorkOrderFlowDTO.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/dto/GdWorkOrderFlowDTO.java
index 988db3c..d581717 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/dto/GdWorkOrderFlowDTO.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/dto/GdWorkOrderFlowDTO.java
@@ -16,9 +16,11 @@
*/
package org.sxkj.gd.workorder.dto;
-import org.sxkj.gd.workorder.entity.GdWorkOrderFlowEntity;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import lombok.EqualsAndHashCode;
+import java.io.Serializable;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
/**
* 流程记录表 数据传输对象实体类
@@ -27,8 +29,43 @@
* @since 2026-01-14
*/
@Data
-@EqualsAndHashCode(callSuper = true)
-public class GdWorkOrderFlowDTO extends GdWorkOrderFlowEntity {
- private static final long serialVersionUID = 1L;
+public class GdWorkOrderFlowDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("主键id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ /**
+ * 流转名称
+ */
+ @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 = "区域编码")
+ private String areaCode;
}
--
Gitblit v1.9.3