From 045023133d111be97ad52f097b4b99a2cf5a8311 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 06 九月 2024 00:22:47 +0800
Subject: [PATCH] 考核结果导出优化2

---
 ycl-server/src/main/resources/mapper/zgyw/CheckIndexCarMapper.xml |    6 ++++--
 1 files changed, 4 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..fe35b61 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,6 +48,7 @@
                 </foreach>
             </if>
         </where>
+        order by tcic.examine_tag desc,tcic.create_time,tcs.score desc
     </select>
 
     <select id="selectCheckIndexCarById" resultMap="CheckIndexCarResult">

--
Gitblit v1.8.0