From e192e2f080774b0dbb7c0f03f4c6895e6923b373 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Wed, 22 Nov 2023 17:29:12 +0800
Subject: [PATCH] 飞行里程
---
src/main/java/com/dji/sample/media/dao/IFileMapper.xml | 13 ++++++-------
1 files changed, 6 insertions(+), 7 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 5528d10..b63de38 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,7 @@
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 != ''">
@@ -58,16 +58,14 @@
<if test="param.endTime !=null and param.endTime !=null">
AND DATE_FORMAT(FROM_UNIXTIME(j.create_time/1000,'%Y-%m-%d'),'%Y-%m-%d') <= DATE_FORMAT(#{param.endTime},'%Y-%m-%d')
</if>
- <if test="param.sort eq 2">
- and j.collect_status = 1
- </if>
- <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
+ ORDER BY
+ <if test="param.sort eq 2">j.collect_status = 1 desc,</if>
+ <if test="param.sort eq 3">m.collect_status = 1 desc,</if>
+ j.create_time desc
</select>
<select id="mediaDetail" resultType="com.dji.sample.media.model.MediaJobDTO">
SELECT
@@ -84,5 +82,6 @@
<if test="jobId != null and jobId != ''">
and m.job_id = #{jobId}
</if>
+ ORDER BY type = '视频' DESC
</select>
</mapper>
--
Gitblit v1.9.3