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/GdTaskResultVO.java | 120 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 115 insertions(+), 5 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/vo/GdTaskResultVO.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/vo/GdTaskResultVO.java
index 2c776d1..34fb282 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/vo/GdTaskResultVO.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/vo/GdTaskResultVO.java
@@ -16,9 +16,14 @@
*/
package org.sxkj.gd.workorder.vo;
-import org.sxkj.gd.workorder.entity.GdTaskResultEntity;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import lombok.EqualsAndHashCode;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
/**
* 成果表 视图实体类
@@ -27,8 +32,113 @@
* @since 2026-01-14
*/
@Data
-@EqualsAndHashCode(callSuper = true)
-public class GdTaskResultVO extends GdTaskResultEntity {
- private static final long serialVersionUID = 1L;
+public class GdTaskResultVO implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("主键id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ /**
+ * 关联工单任务表ID
+ */
+ @ApiModelProperty(value = "关联工单任务表ID")
+ private Long workOrderId;
+ /**
+ * 关联巡查任务表ID
+ */
+ @ApiModelProperty(value = "关联巡查任务表ID")
+ private Long patrolTaskId;
+ /**
+ * 成果编号
+ */
+ @ApiModelProperty(value = "成果编号")
+ private String resultCode;
+ /**
+ * 成果URL
+ */
+ @ApiModelProperty(value = "成果URL")
+ private String resultUrl;
+ /**
+ * 拍照时间
+ */
+ @ApiModelProperty(value = "拍照时间")
+ private Date shootTime;
+ /**
+ * 照片数据（JSON格式）
+ */
+ @ApiModelProperty(value = "照片数据（JSON格式）")
+ private String photoData;
+ /**
+ * 经度
+ */
+ @ApiModelProperty(value = "经度")
+ private Double longitude;
+ /**
+ * 纬度
+ */
+ @ApiModelProperty(value = "纬度")
+ private Double latitude;
+ /**
+ * 分发事件状态：0未分发、1已分发、2已驳回
+ */
+ @ApiModelProperty(value = "分发事件状态：0未分发、1已分发、2已驳回")
+ private Integer distributeStatus;
+ /**
+ * 区域编码
+ */
+ @ApiModelProperty(value = "区域编码")
+ private String areaCode;
+
+ @ApiModelProperty(value = "分发人员")
+ private String distributeUserName;
+
+ @ApiModelProperty(value = "分发部门")
+ private String distributeDeptName;
+
+ @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;
+
+ @ApiModelProperty(value = "状态")
+ private Integer status;
+
+ @ApiModelProperty(value = "逻辑删除")
+ private Integer isDeleted;
+
+ // patrol_task_name
+ @ApiModelProperty(value = "巡查任务名称")
+ private String patrolTaskName;
+
+ /**
+ * 关联巡查任务表ID
+ */
+ @ApiModelProperty(value = "关联巡查任务表IDs")
+ private List<Long> patrolTaskIds;
+
+ /**
+ * 附件类型：0图片 1视频 2其他
+ */
+ @ApiModelProperty(value = "附件类型：0图片 1视频 2其他")
+ private Integer attachmentType;
+
+ // geojson
+ @ApiModelProperty(value = "geojson")
+ private String geojson;
+
+ // eventName
+ @ApiModelProperty(value = "事件名称")
+ private String eventName;
}
--
Gitblit v1.9.3