From cf25acecf27ab3f7bd1511e11cdeecccbad8f196 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 22 五月 2025 11:28:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
framework/src/main/resources/mapper/lmk/VideoMapper.xml | 56 +++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 49 insertions(+), 7 deletions(-)
diff --git a/framework/src/main/resources/mapper/lmk/VideoMapper.xml b/framework/src/main/resources/mapper/lmk/VideoMapper.xml
index de55ef3..417ca5e 100644
--- a/framework/src/main/resources/mapper/lmk/VideoMapper.xml
+++ b/framework/src/main/resources/mapper/lmk/VideoMapper.xml
@@ -6,6 +6,7 @@
<resultMap id="BaseResultMap" type="cn.lili.modules.lmk.domain.vo.VideoVO">
<id column="id" property="id"/>
<result column="author_id" property="authorId" />
+ <result column="authorName" property="authorName" />
<result column="cover_url" property="coverUrl" />
<result column="video_file_key" property="videoFileKey" />
<result column="video_fit" property="videoFit" />
@@ -20,12 +21,8 @@
<result column="comment_num" property="commentNum" />
<result column="weight" property="weight" />
<result column="audit_pass_time" property="auditPassTime" />
+ <result column="update_time" property="updateTime" />
</resultMap>
-
-
-
-
-
<select id="getById" resultMap="BaseResultMap">
@@ -45,9 +42,12 @@
LV.comment_num,
LV.weight,
LV.audit_pass_time,
- LV.id
+ LV.update_time,
+ LV.id,
+ LM.nick_name as authorName
FROM
lmk_video LV
+ LEFT JOIN li_member LM ON LV.author_id = LM.id
WHERE
LV.id = #{id} AND LV.delete_flag = 0
</select>
@@ -70,11 +70,53 @@
LV.comment_num,
LV.weight,
LV.audit_pass_time,
- LV.id
+ LV.update_time,
+ LV.id,
+ LM.nick_name as authorName
FROM
lmk_video LV
+ LEFT JOIN li_member LM ON LV.author_id = LM.id
WHERE
LV.delete_flag = 0
</select>
+
+ <select id="managerPage" resultMap="BaseResultMap">
+ SELECT
+ LV.author_id,
+ LV.cover_url,
+ LV.video_fit,
+ LV.video_file_key,
+ LV.title,
+ LV.goods_id,
+ LV.goods_view_num,
+ LV.goods_order_num,
+ LV.recommend,
+ LV.status,
+ LV.play_num,
+ LV.collect_num,
+ LV.comment_num,
+ LV.weight,
+ LV.audit_pass_time,
+ LV.update_time,
+ LV.id,
+ LM.nick_name as authorName
+ FROM
+ lmk_video LV
+ LEFT JOIN li_member LM ON LV.author_id = LM.id
+ <if test="query.tagList != null and query.tagList.size > 0">
+ INNER JOIN (
+ SELECT DISTINCT video_id
+ FROM lmk_video_tag_ref
+ WHERE video_tag_id IN
+ <foreach collection="query.tagList" open="(" item="tagId" close=")" separator=",">#{tagId}</foreach>
+ ) AS LVT ON LV.id = LVT.video_id
+ </if>
+ WHERE
+ LV.delete_flag = 0
+ <if test="query.title != null and query.title != ''">AND LV.title LIKE CONCAT('%', #{query.title}, '%')</if>
+ <if test="query.authorId != null and query.authorId != ''">AND LV.author_id = #{query.authorId}</if>
+ <if test="query.status != null and query.status != ''">AND LV.status = #{query.status}</if>
+ </select>
+
</mapper>
--
Gitblit v1.8.0