From 90276a76b56cc1e744f7fa68ce921a28a8a9c92f Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 08 一月 2025 11:52:10 +0800
Subject: [PATCH] 运行监控报表导出时间少一天问题
---
ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml | 51 +++++++++++++++++++++++++++++++++++++--------------
1 files changed, 37 insertions(+), 14 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml
index bede2bc..33bfe57 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml
@@ -137,31 +137,32 @@
</select>
<insert id="saveBatch">
- insert into t_check_score (score,dept_id,template_id,examine_tag,examine_category,create_time) values
+ insert into t_check_score (score,dept_id,template_id,index_id,examine_tag,examine_category,create_time) values
<foreach collection="scoreList" separator="," item="score">
- (#{score.score},#{score.deptId},#{score.templateId},#{score.examineTag},#{score.examineCategory},#{score.createTime})
+ (#{score.score},#{score.deptId},#{score.templateId},#{score.indexId},#{score.examineTag},#{score.examineCategory},#{score.createTime})
</foreach>
</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">
@@ -179,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
@@ -205,4 +206,26 @@
ORDER BY score DESC, tcs.dept_id
</select>
+ <select id="dashboard" resultType="com.ycl.platform.domain.entity.CheckScore">
+ 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
+ </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