From bf4990ffb53e2a0e7b2ec0c7a8a054bdf8a57db5 Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Thu, 16 Nov 2023 10:02:13 +0800
Subject: [PATCH] 无人机 -设备分页新增保护区ID查询条件
---
src/main/java/com/dji/sample/media/dao/IFileMapper.xml | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/dji/sample/media/dao/IFileMapper.xml b/src/main/java/com/dji/sample/media/dao/IFileMapper.xml
index eda2ff1..d9fd9a0 100644
--- a/src/main/java/com/dji/sample/media/dao/IFileMapper.xml
+++ b/src/main/java/com/dji/sample/media/dao/IFileMapper.xml
@@ -42,7 +42,8 @@
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
- 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') t ON t.job_id = m.job_id
+ 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
+ LEFT JOIN wayline_file w ON w.wayline_id = j.file_id
where 1=1
<if test="workspaceId != null and workspaceId != ''">
and j.workspace_id = #{workspaceId}
@@ -63,6 +64,9 @@
<if test="param.sort eq 3">
and m.collect_status = 1
</if>
+ <if test="param.waylineFileId != null and param.waylineFileId != ''">
+ and w.wayline_id = #{param.waylineFileId}
+ </if>
GROUP BY m.job_id
</select>
<select id="mediaDetail" resultType="com.dji.sample.media.model.MediaJobDTO">
--
Gitblit v1.9.3