From c83101eb62f5d4906b9c01ceea6b21a37f9e84d8 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 18 十一月 2025 09:24:53 +0800
Subject: [PATCH] bug修复
---
ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml
index 45b4d2f..33bfe57 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml
@@ -180,21 +180,21 @@
d.area,
CASE
WHEN cs.examine_tag = '0' THEN '鐪佸巺'
- WHEN cs.examine_tag = '1' THEN '甯傚眬'
+ WHEN cs.examine_tag = '1' THEN '鍖哄幙'
WHEN cs.examine_tag = '2' THEN '' END AS examineTag,
ct.template_name AS templateName,
cs.score
FROM t_check_score cs
LEFT JOIN t_check_template ct ON cs.template_id = ct.id
LEFT JOIN sys_dept d ON cs.dept_id = d.dept_id
- WHERE cs.score < ct.alarm_score
+ WHERE cs.score < ct.alarm_score and cs.create_time between #{startTime} and #{endTime}
ORDER BY cs.create_time DESC
]]>
</select>
<select id="calculate" resultType="java.util.Map">
SELECT area AS deptName,
- ROUND(AVG(score)) AS score
+ ROUND(AVG(score),2) AS score
FROM t_check_score tcs
LEFT JOIN sys_dept d ON tcs.dept_id = d.dept_id
WHERE examine_tag = 1
@@ -207,15 +207,25 @@
</select>
<select id="dashboard" resultType="com.ycl.platform.domain.entity.CheckScore">
- select s.*,d.area as deptName from t_check_score s
+ select score,d.area as deptName,s.examine_category from t_check_score s
left join sys_dept d on s.dept_id = d.dept_id
<where>
+ s.create_time between #{startTime} and #{endTime}
<if test="dataScope == 1">
+ AND s.examine_tag = 0
+ </if>
+ <if test="dataScope == 2">
AND s.examine_tag = 1
</if>
+ <if test="dataScope == 3">
+ AND s.examine_tag = 2
+ </if>
</where>
- ORDER BY
- s.create_time DESC
- LIMIT 7
+ ORDER BY s.create_time DESC
+ </select>
+
+ <select id="selectToday" resultType="com.ycl.platform.domain.entity.CheckScore">
+ select * from t_check_score
+ where date(create_time) = #{day}
</select>
</mapper>
--
Gitblit v1.8.0