From 5b76d629eef02be2f8c7c8ccde13d02aee25e63b Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 18 九月 2024 16:17:54 +0800
Subject: [PATCH] 大屏优化

---
 ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml |   31 ++++++++++++++++++++++---------
 1 files changed, 22 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 b06801c..45b4d2f 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">
@@ -205,4 +206,16 @@
         ORDER BY score DESC, tcs.dept_id
     </select>
 
+    <select id="dashboard" resultType="com.ycl.platform.domain.entity.CheckScore">
+        select s.*,d.area as deptName from t_check_score s
+        left join sys_dept d on s.dept_id = d.dept_id
+        <where>
+            <if test="dataScope == 1">
+                AND s.examine_tag = 1
+            </if>
+        </where>
+        ORDER BY
+        s.create_time DESC
+        LIMIT 7
+    </select>
 </mapper>

--
Gitblit v1.8.0