From 618ece4b9b22c2b9a4e85b46f0b3ec99c53e200b Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 02 Apr 2026 16:38:55 +0800
Subject: [PATCH] opt: sql改造其他模块改造12
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdClueEventMapper.xml | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 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 ac5e1c0..bacf84c 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
@@ -86,11 +86,11 @@
<select id="selectGdClueEventList" resultMap="gdClueEventVoResultMap">
select ce.*,
- ifnull(bu.real_name, bu.name) as dispose_user_name,
+ 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 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::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">
@@ -98,7 +98,7 @@
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 != ''">
@@ -111,9 +111,9 @@
<select id="selectGdClueEventDetailById" resultMap="gdClueEventVoResultMap">
select ce.*,
- ifnull(bu.real_name, bu.name) as dispose_user_name,
+ COALESCE(bu.real_name, bu.name) as dispose_user_name,
bd.dept_name as dispose_dept_name,
- ifnull(cu.real_name, cu.name) as distribute_user_name,
+ COALESCE(cu.real_name, cu.name) as distribute_user_name,
cd.dept_name as distribute_dept_name,
ce.create_time as distribute_time,
concat(ce.longitude, ',', ce.latitude) as event_location,
@@ -121,18 +121,18 @@
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>
<select id="selectGdClueEventCount" resultMap="gdClueEventCountVoResultMap">
select count(1) as total_count,
- ifnull(sum(case when ce.dispose_user = #{userId} then 1 else 0 end), 0) as my_count
+ COALESCE(sum(case when ce.dispose_user = #{userId} then 1 else 0 end), 0) as my_count
from ja_gd_clue_event ce
<include refid="gdClueEventDeptWhere"/>
and ce.event_status in (1, 3)
--
Gitblit v1.9.3