From ee70b08a5dc4958591e1aaf7809eca51ca9e2861 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 23 Jun 2026 14:14:21 +0800
Subject: [PATCH] add : 吉安支持查询待验收的接口
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/entity/GdClueEventEntity.java | 8 ++++++++
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/vo/GdClueEventVO.java | 6 ++++++
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdClueEventMapper.xml | 8 ++++----
3 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/entity/GdClueEventEntity.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/entity/GdClueEventEntity.java
index 624d51f..1f8adbd 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/entity/GdClueEventEntity.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/entity/GdClueEventEntity.java
@@ -23,6 +23,8 @@
import lombok.EqualsAndHashCode;
import org.springblade.core.mp.base.BaseEntity;
+import java.util.Date;
+
/**
* 事件表（线索事件） 实体类
*
@@ -102,4 +104,10 @@
@ApiModelProperty(value = "AI图片的画框数据")
private String geojson;
+ /**
+ * 拍摄时间
+ */
+ @ApiModelProperty(value = "拍摄时间")
+ private Date shootTime;
+
}
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdClueEventMapper.xml b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdClueEventMapper.xml
index 35431da..6b85919 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdClueEventMapper.xml
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdClueEventMapper.xml
@@ -127,10 +127,10 @@
ce.create_time as distribute_time,
concat(ce.longitude, ',', ce.latitude) as event_location,
ce.event_num as event_num,
- tr.shoot_time as shoot_time,
- tr.result_url as event_image_url,
- tr.geojson as geojson,
- tr.attachment_type
+ COALESCE(tr.shoot_time, ce.shoot_time) as shoot_time,
+ COALESCE(tr.result_url, ce.attach_url) as event_image_url,
+ COALESCE(tr.geojson, ce.geojson) as geojson,
+ COALESCE(tr.attachment_type, ce.attachment_type) as attachment_type
from ja_gd_clue_event ce
left join blade_user bu on bu.id::VARCHAR = ce.dispose_user::VARCHAR and bu.is_deleted = 0
left join blade_dept bd on bd.id::VARCHAR = ce.dispose_dept::VARCHAR and bd.is_deleted = 0
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 cee076a..21bcfae 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
@@ -174,5 +174,11 @@
@ApiModelProperty(value = "事件附件类型")
private Integer attachmentType;
+ /**
+ * 事件名称
+ */
+ @ApiModelProperty(value = "事件名称")
+ private String eventName;
+
}
--
Gitblit v1.9.3