From e458ae3ec8c4ae734f6e5e32e3d970860a51ac82 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 09 九月 2024 18:35:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/resources/mapper/zgyw/CheckIndexVideoMapper.xml | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/CheckIndexVideoMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CheckIndexVideoMapper.xml
index 380a48e..4790df7 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/CheckIndexVideoMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/CheckIndexVideoMapper.xml
@@ -34,12 +34,13 @@
from t_check_index_video tciv left join sys_dept sd on tciv.dept_id = sd.dept_id
left join t_check_score tcs on tciv.id = tcs.index_id
<where>
+ tcs.examine_category = 1
<if test="deptId != null "> and tciv.dept_id = #{deptId}</if>
- <if test="examineTag != null "> and examine_tag = #{examineTag}</if>
+ <if test="examineTag != null "> and tciv.examine_tag = #{examineTag}</if>
<if test="date != null "> and date_format(tciv.create_time,'%Y-%m') = #{date}</if>
<if test="day != null "> and date(tciv.create_time) = #{day}</if>
<if test="createTime != null "> and date(tciv.create_time) = #{createTime}</if>
- <if test="params.publish != null and params.publish != ''">and publish = #{params.publish}</if>
+ <if test="params.publish != null and params.publish != ''">and tciv.publish = #{params.publish}</if>
<if test="deptIds != null ">and tciv.dept_id in
<foreach collection="deptIds" separator="," open="(" close=")" item="deptId">
#{deptId}
@@ -51,8 +52,22 @@
</foreach>
</if>
</where>
+ order by tciv.examine_tag desc,tciv.create_time,tcs.score desc
</select>
-
+ <select id="getCheckIndexVideoList" parameterType="CheckIndexVideo" resultMap="CheckIndexVideoResult">
+ select tciv.*,sd.dept_name
+ from t_check_index_video tciv left join sys_dept sd on tciv.dept_id = sd.dept_id
+ <where>
+ <if test="examineTag != null "> and tciv.examine_tag = #{examineTag}</if>
+ <if test="day != null "> and date(tciv.create_time) = #{day}</if>
+ <if test="createTime != null "> and date(tciv.create_time) = #{createTime}</if>
+ <if test="deptIds != null ">and tciv.dept_id in
+ <foreach collection="deptIds" separator="," open="(" close=")" item="deptId">
+ #{deptId}
+ </foreach>
+ </if>
+ </where>
+ </select>
<select id="selectCheckIndexVideoById" resultMap="CheckIndexVideoResult">
<include refid="selectCheckIndexVideoVo"/>
where id = #{id}
--
Gitblit v1.8.0