From 9f09b885f077044eee13a5768baa185a27dc99a4 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 02 Apr 2026 16:13:53 +0800
Subject: [PATCH] opt: sql改造其他模块改造11
---
drone-ops/drone-resource/src/main/java/org/sxkj/resource/mapper/IFileMapper.xml | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/drone-ops/drone-resource/src/main/java/org/sxkj/resource/mapper/IFileMapper.xml b/drone-ops/drone-resource/src/main/java/org/sxkj/resource/mapper/IFileMapper.xml
index 797415e..d329f15 100644
--- a/drone-ops/drone-resource/src/main/java/org/sxkj/resource/mapper/IFileMapper.xml
+++ b/drone-ops/drone-resource/src/main/java/org/sxkj/resource/mapper/IFileMapper.xml
@@ -39,12 +39,12 @@
COUNT( CASE WHEN m.file_name LIKE '%.jpeg' THEN 1 END ) AS picCount,
DATE_FORMAT(FROM_UNIXTIME(j.create_time/1000,'%Y-%m-%d'),'%Y-%m-%d') as create_time
FROM
- media_file m LEFT JOIN wayline_job j ON m.job_id = j.job_id::VARCHAR
+ media_file m LEFT JOIN wayline_job j ON m.job_id::VARCHAR = j.job_id::VARCHAR
-- LEFT JOIN (SELECT CONCAT("https://dev.jxpskj.com:8026/cloud-bucket",object_key) as url,job_id from media_file
- WHERE file_name LIKE '%.jpeg' GROUP BY job_id) t ON t.job_id = m.job_id::VARCHAR
+ WHERE file_name LIKE '%.jpeg' GROUP BY job_id) t ON t.job_id::VARCHAR = m.job_id::VARCHAR
LEFT JOIN (SELECT CONCAT(#{param.fileAddress},object_key) as url,job_id from media_file WHERE file_name LIKE
- '%.jpeg' GROUP BY job_id) t ON t.job_id = m.job_id::VARCHAR
- LEFT JOIN wayline_file w ON w.wayline_id = j.file_id::VARCHAR
+ '%.jpeg' GROUP BY job_id) t ON t.job_id::VARCHAR = m.job_id::VARCHAR
+ LEFT JOIN wayline_file w ON w.wayline_id::VARCHAR = j.file_id::VARCHAR
where 1=1
<if test="workspaceId != null and workspaceId != ''">
and j.workspace_id = #{workspaceId}
@@ -102,8 +102,8 @@
md.nickname as airportName
FROM
odm_task_info odm
- LEFT JOIN wayline_job wj ON wj.job_id = odm.wayline_job_id::VARCHAR
- LEFT JOIN manage_device md on md.device_sn = wj.dock_sn::VARCHAR
+ LEFT JOIN wayline_job wj ON wj.job_id::VARCHAR = odm.wayline_job_id::VARCHAR
+ LEFT JOIN manage_device md on md.device_sn::VARCHAR = wj.dock_sn::VARCHAR
<where>
AND wj.job_type = 4
AND wj.workspace_id = #{workspaceId}
@@ -153,7 +153,7 @@
COALESCE( sum( CASE WHEN result_type = 5 THEN 1 ELSE 0 END ), 0 ) AS "fullNum"
FROM
blade_attach a
- LEFT JOIN wayline_job wj ON a.wayline_job_id = wj.job_id::VARCHAR
+ LEFT JOIN wayline_job wj ON a.wayline_job_id::VARCHAR = wj.job_id::VARCHAR
left JOIN wayline_job_info wji ON wji.id = wj.job_info_id::VARCHAR AND wji.is_deleted = 0
left join drone_job_event_rela rela on a.id = rela.attach_id::VARCHAR
<where>
--
Gitblit v1.9.3