From f247e3eef107985b6dc7d2bc04803235570b15a7 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Fri, 23 Jan 2026 15:57:49 +0800
Subject: [PATCH] 事件分发时新增事件编号，事件详情新增编号模糊查询
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdClueEventMapper.xml | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 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 61abb07..ac5e1c0 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
@@ -13,6 +13,7 @@
<result column="latitude" property="latitude"/>
<result column="event_status" property="eventStatus"/>
<result column="area_code" property="areaCode"/>
+ <result column="event_num" property="eventNum"/>
<result column="create_user" property="createUser"/>
<result column="create_dept" property="createDept"/>
<result column="create_time" property="createTime"/>
@@ -34,7 +35,7 @@
<result column="latitude" property="latitude"/>
<result column="event_status" property="eventStatus"/>
<result column="area_code" property="areaCode"/>
- <result column="event_code" property="eventCode"/>
+ <result column="event_num" property="eventNum"/>
<result column="event_location" property="eventLocation"/>
<result column="shoot_time" property="shootTime"/>
<result column="event_image_url" property="eventImageUrl"/>
@@ -75,6 +76,7 @@
<result column="latitude" property="latitude"/>
<result column="event_status" property="eventStatus"/>
<result column="area_code" property="areaCode"/>
+ <result column="event_num" property="eventNum"/>
<result column="is_deleted" property="isDeleted"/>
</resultMap>
@@ -99,6 +101,9 @@
left join ja_gd_task_result tr on tr.id = ce.result_id 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}, '%')
+ </if>
<if test="onlyMine != null and onlyMine == 1">
and ce.dispose_user = #{userId}
</if>
@@ -112,7 +117,7 @@
cd.dept_name as distribute_dept_name,
ce.create_time as distribute_time,
concat(ce.longitude, ',', ce.latitude) as event_location,
- tr.result_code as event_code,
+ ce.event_num as event_num,
tr.shoot_time as shoot_time,
tr.result_url as event_image_url
from ja_gd_clue_event ce
@@ -131,6 +136,9 @@
from ja_gd_clue_event ce
<include refid="gdClueEventDeptWhere"/>
and ce.event_status in (1, 3)
+ <if test="keyword != null and keyword != ''">
+ and ce.event_num like concat('%', #{keyword}, '%')
+ </if>
</select>
--
Gitblit v1.9.3