From da3e63a308e4b209d53b049074d47f0c04b0bb30 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Tue, 09 Dec 2025 11:22:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-work/src/main/resources/mapper/ArdMediaMapper.xml | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/ard-work/src/main/resources/mapper/ArdMediaMapper.xml b/ard-work/src/main/resources/mapper/ArdMediaMapper.xml
index 21f6459..2548d11 100644
--- a/ard-work/src/main/resources/mapper/ArdMediaMapper.xml
+++ b/ard-work/src/main/resources/mapper/ArdMediaMapper.xml
@@ -3,7 +3,7 @@
<mapper namespace="com.ard.work.mapper.ArdMediaMapper">
<!-- 结果映射 -->
- <resultMap id="ArdMediaResult" type="com.ard.work.domain.entity.ArdMedia">
+ <resultMap id="ArdMediaResult" type="ArdMedia">
<result property="id" column="id"/>
<result property="taskId" column="task_id"/>
<result property="mediaType" column="media_type"/>
@@ -42,7 +42,11 @@
<if test="captureTime != null">AND capture_time = #{captureTime}</if>
<if test="createTime != null">AND create_time = #{createTime}</if>
</where>
- ORDER BY create_time DESC
+ ORDER BY
+ CASE
+ WHEN media_type = 0 THEN capture_time
+ ELSE create_time
+ END DESC
</select>
--
Gitblit v1.9.3