From b954d7a119eb635394bf4ff3619a9ab4b4978e48 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 02 Apr 2026 09:33:34 +0800
Subject: [PATCH] sql改造首页
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdClueEventMapper.xml | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 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..2a6d831 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>
@@ -87,8 +89,8 @@
ifnull(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 and bu.is_deleted = 0
- left join blade_dept bd on bd.id = ce.dispose_dept and bd.is_deleted = 0
+ 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
</select>
<select id="selectGdClueEventSimpleList" resultMap="gdClueEventListVoResultMap">
@@ -96,9 +98,12 @@
tr.result_url as event_image_url,
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 and tr.is_deleted = 0
+ left join ja_gd_task_result tr on tr.id = 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}, '%')
+ </if>
<if test="onlyMine != null and onlyMine == 1">
and ce.dispose_user = #{userId}
</if>
@@ -112,15 +117,15 @@
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
- left join blade_user bu on bu.id = ce.dispose_user and bu.is_deleted = 0
- left join blade_dept bd on bd.id = ce.dispose_dept and bd.is_deleted = 0
- left join blade_user cu on cu.id = ce.create_user and cu.is_deleted = 0
- left join blade_dept cd on cd.id = ce.create_dept and cd.is_deleted = 0
- left join ja_gd_task_result tr on tr.id = ce.result_id and tr.is_deleted = 0
+ 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
<include refid="gdClueEventDeptWhere"/>
and ce.id = #{id}
</select>
@@ -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