From beb202f8cb7c5699173cac358dd167dcb7901b26 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 09 Jun 2026 11:26:38 +0800
Subject: [PATCH] feat(workorder): 添加事件地理信息和附件类型字段
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdClueEventMapper.xml | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
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 634f005..725da85 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
@@ -55,6 +55,8 @@
<result column="id" property="id"/>
<result column="event_image_url" property="eventImageUrl"/>
<result column="create_time" property="createTime"/>
+ <result column="geojson" property="geojson"/>
+ <result column="attachment_type" property="attachmentType"/>
</resultMap>
<resultMap id="gdClueEventCountVoResultMap" type="org.sxkj.gd.workorder.vo.GdClueEventCountVO">
@@ -89,20 +91,22 @@
COALESCE(bu.real_name, bu.name) as dispose_user_name,
bd.dept_name as dispose_dept_name
from (select * from ja_gd_clue_event ${ew.customSqlSegment}) ce
- left join blade_user bu on bu.id = ce.dispose_user::VARCHAR and bu.is_deleted = 0
- left join blade_dept bd on bd.id = ce.dispose_dept::VARCHAR and bd.is_deleted = 0
+ 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
</select>
<select id="selectGdClueEventSimpleList" resultMap="gdClueEventListVoResultMap">
select ce.id as id,
tr.result_url as event_image_url,
+ tr.geojson as geojson,
+ tr.attachment_type as attachmentType,
ce.create_time as create_time
from ja_gd_clue_event ce
- left join ja_gd_task_result tr on tr.id = ce.result_id::VARCHAR and tr.is_deleted = 0
+ left join ja_gd_task_result tr on tr.id::VARCHAR = ce.result_id::VARCHAR and tr.is_deleted = 0
<include refid="gdClueEventDeptWhere"/>
and ce.event_status in (1, 3)
<if test="keyword != null and keyword != ''">
- and ce.event_num like concat('%', #{keyword}, '%')
+ and ce.event_num::VARCHAR like concat('%', #{keyword}, '%')
</if>
<if test="onlyMine != null and onlyMine == 1">
and ce.dispose_user = #{userId}
@@ -121,11 +125,11 @@
tr.shoot_time as shoot_time,
tr.result_url as event_image_url
from ja_gd_clue_event ce
- left join blade_user bu on bu.id = ce.dispose_user::VARCHAR and bu.is_deleted = 0
- left join blade_dept bd on bd.id = ce.dispose_dept::VARCHAR and bd.is_deleted = 0
- left join blade_user cu on cu.id = ce.create_user::VARCHAR and cu.is_deleted = 0
- left join blade_dept cd on cd.id = ce.create_dept::VARCHAR and cd.is_deleted = 0
- left join ja_gd_task_result tr on tr.id = ce.result_id::VARCHAR and tr.is_deleted = 0
+ 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
+ left join blade_user cu on cu.id::VARCHAR = ce.create_user::VARCHAR and cu.is_deleted = 0
+ left join blade_dept cd on cd.id::VARCHAR = ce.create_dept::VARCHAR and cd.is_deleted = 0
+ left join ja_gd_task_result tr on tr.id::VARCHAR = ce.result_id::VARCHAR and tr.is_deleted = 0
<include refid="gdClueEventDeptWhere"/>
and ce.id = #{id}
</select>
--
Gitblit v1.9.3