From ed17071e1db9208dbda562655f7fb541db4f2ea4 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 06 九月 2024 12:48:10 +0800
Subject: [PATCH] 考核积分bug,分保留一位小数

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

diff --git a/ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml
index 201063c..0d89d89 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml
@@ -144,24 +144,25 @@
     </insert>
 
     <select id="selectCheckScoreMap" resultType="com.ycl.platform.domain.entity.CheckScore">
-        SELECT
-        id,
+        SELECT * FROM
+        (SELECT
+        tcs.id,
         tcs.dept_id,
-        examine_category,
-        ROUND(AVG(score) OVER(PARTITION BY tcs.dept_id, examine_category), 2) AS score,
+        tcs.examine_category,
         tcs.publish,
-        tcs.create_time AS createTime
+        tcs.create_time,
+        ROW_NUMBER() OVER(PARTITION BY tcs.dept_id, tcs.examine_category ORDER BY tcs.create_time DESC) AS rn,
+        AVG(tcs.score) OVER(PARTITION BY tcs.dept_id, tcs.examine_category) AS score
         FROM
         t_check_score tcs
         LEFT JOIN sys_dept d ON tcs.dept_id = d.dept_id
         <where>
             examine_tag = #{examineTag}
-            AND DATE_FORMAT(tcs.create_time, '%Y-%m') BETWEEN DATE_FORMAT(#{startDate}, '%Y-%m') AND
-            DATE_FORMAT(#{endDate}, '%Y-%m')
-            <if test="params.publish != null  and params.publish != ''">and publish = #{params.publish}</if>
+            AND DATE(tcs.create_time) BETWEEN DATE(#{startDate}) AND DATE(#{endDate})
+            <if test="params.publish != null  and params.publish != ''">AND tcs.publish = #{params.publish}</if>
             ${params.dataScope}
         </where>
-        GROUP BY tcs.dept_id, tcs.examine_category, tcs.examine_tag
+        ) t where rn =1
     </select>
 
     <select id="getLast" resultType="com.ycl.platform.domain.entity.CheckScore">

--
Gitblit v1.8.0