From ac3152e6f81ef89a122378e1842daddfd0696db7 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 02 九月 2024 23:00:09 +0800
Subject: [PATCH] 数据中心bug修改

---
 ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml
index 6096ce2..50a9c53 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml
@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ycl.platform.mapper.CheckScoreMapper">
-    
+
     <resultMap type="com.ycl.platform.domain.entity.CheckScore" id="CheckScoreResult">
         <result property="id"    column="id"    />
         <result property="score"    column="score"    />
@@ -35,13 +35,14 @@
             <if test="deptId != null "> and tcs.dept_id = #{deptId}</if>
             ${params.dataScope}
         </where>
+        order by create_time desc
     </select>
-    
+
     <select id="selectCheckScoreById" parameterType="Long" resultMap="CheckScoreResult">
         <include refid="selectCheckScoreVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertCheckScore" useGeneratedKeys="true" keyProperty="id">
         insert into t_check_score
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -89,7 +90,7 @@
     </delete>
 
     <delete id="deleteCheckScoreByIds" parameterType="String">
-        delete from t_check_score where id in 
+        delete from t_check_score where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
@@ -106,6 +107,9 @@
         select t.* from ${tableName} t
         left join sys_dept d on t.dept_id = d.dept_id
         where t.dept_id = #{deptId}
+        <if test="examineTag != null">
+            and examine_tag = #{examineTag}
+        </if>
         <if test="date != null">
             and date_format(t.create_time,'%Y-%m') = #{date}
         </if>
@@ -155,7 +159,7 @@
 
     <select id="calculate" resultType="java.util.Map">
         SELECT
-            dept_name AS deptName,
+            area AS deptName,
             ROUND(AVG(score)) AS score
         FROM
             t_check_score tcs
@@ -168,4 +172,4 @@
         ORDER BY score DESC, tcs.dept_id
     </select>
 
-</mapper>
\ No newline at end of file
+</mapper>

--
Gitblit v1.8.0