From 71972694f7d5f23cf42226366a9ddaad4b72b89f Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 20 九月 2024 09:33:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/resources/mapper/zgyw/CheckIndexCarMapper.xml | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/CheckIndexCarMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CheckIndexCarMapper.xml
index 533e15c..ae68374 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/CheckIndexCarMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/CheckIndexCarMapper.xml
@@ -31,11 +31,12 @@
from t_check_index_car tcic left join sys_dept sd on tcic.dept_id = sd.dept_id
left join t_check_score tcs on tcic.id = tcs.index_id
<where>
+ tcs.examine_category = 2
<if test="deptId != null "> and tcic.dept_id = #{deptId}</if>
- <if test="examineTag != null "> and examine_tag = #{examineTag}</if>
+ <if test="examineTag != null "> and tcic.examine_tag = #{examineTag}</if>
<if test="date != null "> and date_format(tcic.create_time,'%Y-%m') = #{date}</if>
<if test="day != null "> and date(tcic.create_time) = #{day}</if>
- <if test="params.publish != null and params.publish != ''">and publish = #{params.publish}</if>
+ <if test="params.publish != null and params.publish != ''">and tcic.publish = #{params.publish}</if>
<if test="deptIds != null and deptIds.size()>0">and tcic.dept_id in
<foreach collection="deptIds" separator="," open="(" close=")" item="deptId">
#{deptId}
@@ -47,8 +48,23 @@
</foreach>
</if>
</where>
+ order by tcic.examine_tag desc,tcic.create_time,tcs.score desc
</select>
+ <select id="getCheckIndexCarList" resultMap="CheckIndexCarResult">
+ select tcic.*,sd.dept_name
+ from t_check_index_car tcic left join sys_dept sd on tcic.dept_id = sd.dept_id
+ left join t_check_score tcs on tcic.id = tcs.index_id
+ <where>
+ <if test="examineTag != null "> and tcic.examine_tag = #{examineTag}</if>
+ <if test="day != null "> and date(tcic.create_time) = #{day}</if>
+ <if test="deptIds != null and deptIds.size()>0">and tcic.dept_id in
+ <foreach collection="deptIds" separator="," open="(" close=")" item="deptId">
+ #{deptId}
+ </foreach>
+ </if>
+ </where>
+ </select>
<select id="selectCheckIndexCarById" resultMap="CheckIndexCarResult">
<include refid="selectCheckIndexCarVo"/>
where id = #{id}
--
Gitblit v1.8.0