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/vo/GdClueEventVO.java | 161 ++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 152 insertions(+), 9 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/vo/GdClueEventVO.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/vo/GdClueEventVO.java
index 8dd38f5..2d98d88 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/vo/GdClueEventVO.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/vo/GdClueEventVO.java
@@ -17,9 +17,11 @@
package org.sxkj.gd.workorder.vo;
import io.swagger.annotations.ApiModelProperty;
-import org.sxkj.gd.workorder.entity.GdClueEventEntity;
import lombok.Data;
-import lombok.EqualsAndHashCode;
+import java.io.Serializable;
+import java.util.Date;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
/**
* 事件表（线索事件） 视图实体类
@@ -28,14 +30,155 @@
* @since 2026-01-14
*/
@Data
-@EqualsAndHashCode(callSuper = true)
-public class GdClueEventVO extends GdClueEventEntity {
- private static final long serialVersionUID = 1L;
+public class GdClueEventVO implements Serializable {
+ private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "处置人姓名")
- private String disposeUserName;
+ @ApiModelProperty("主键id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
- @ApiModelProperty(value = "处置部门名称")
- private String disposeDeptName;
+ /**
+ * 关联成果表ID
+ */
+ @ApiModelProperty(value = "关联成果表ID")
+ private Long resultId;
+ /**
+ * 关联工单任务表ID
+ */
+ @ApiModelProperty(value = "关联工单任务表ID")
+ private Long workOrderId;
+ /**
+ * 工单处置人
+ */
+ @ApiModelProperty(value = "工单处置人")
+ private Long disposeUser;
+ /**
+ * 处置部门
+ */
+ @ApiModelProperty(value = "处置部门")
+ private Long disposeDept;
+ /**
+ * 经度
+ */
+ @ApiModelProperty(value = "经度")
+ private Double longitude;
+ /**
+ * 纬度
+ */
+ @ApiModelProperty(value = "纬度")
+ private Double latitude;
+ /**
+ * 状态：0待确认、1处置中、2已退回、3已处置、4已完成
+ */
+ @ApiModelProperty(value = "状态：0待确认、1处置中、2已退回、3已处置、4已完成")
+ private Integer eventStatus;
+ /**
+ * 区域编码
+ */
+ @ApiModelProperty(value = "区域编码")
+ private String areaCode;
+
+ /**
+ * 事件编号
+ */
+ @ApiModelProperty(value = "事件编号")
+ private String eventNum;
+
+ /**
+ * 事件位置
+ */
+ @ApiModelProperty(value = "事件位置")
+ private String eventLocation;
+
+ /**
+ * 拍摄时间
+ */
+ @ApiModelProperty(value = "拍摄时间")
+ private Date shootTime;
+
+ /**
+ * 事件图片url
+ */
+ @ApiModelProperty(value = "事件图片url")
+ private String eventImageUrl;
+
+ @ApiModelProperty(value = "处置人姓名")
+ private String disposeUserName;
+
+ @ApiModelProperty(value = "处置部门名称")
+ private String disposeDeptName;
+
+ /**
+ * 分发人员名称
+ */
+ @ApiModelProperty(value = "分发人员名称")
+ private String distributeUserName;
+
+ /**
+ * 分发部门名称
+ */
+ @ApiModelProperty(value = "分发部门名称")
+ private String distributeDeptName;
+
+ /**
+ * 分发时间
+ */
+ @ApiModelProperty(value = "分发时间")
+ private Date distributeTime;
+
+ /**
+ * 创建人
+ */
+ @ApiModelProperty(value = "创建人")
+ private Long createUser;
+
+ /**
+ * 创建部门
+ */
+ @ApiModelProperty(value = "创建部门")
+ private Long createDept;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(value = "创建时间")
+ private Date createTime;
+
+ /**
+ * 更新人
+ */
+ @ApiModelProperty(value = "更新人")
+ private Long updateUser;
+
+ /**
+ * 更新时间
+ */
+ @ApiModelProperty(value = "更新时间")
+ private Date updateTime;
+
+ /**
+ * 状态（0正常 1停用）
+ */
+ @ApiModelProperty(value = "状态（0正常 1停用）")
+ private Integer status;
+
+ /**
+ * 删除标志（0存在 1删除）
+ */
+ @ApiModelProperty(value = "删除标志（0存在 1删除）")
+ private Integer isDeleted;
+
+ @ApiModelProperty(value = "事件geojson")
+ private String geojson;
+
+ @ApiModelProperty(value = "事件附件类型")
+ private Integer attachmentType;
+
+ /**
+ * 事件名称
+ */
+ @ApiModelProperty(value = "事件名称")
+ private String eventName;
+
}
--
Gitblit v1.9.3