From 25c0f523fccd89da32077f8f9b3da2a0d2502de2 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期六, 24 八月 2024 12:08:10 +0800
Subject: [PATCH] 工单阈值增加排序
---
ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml | 52 +++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 43 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 0efeca1..479d03f 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml
@@ -105,7 +105,13 @@
<select id="selectScoreIndex" resultType="java.util.Map">
select t.* from ${tableName} t
left join sys_dept d on t.dept_id = d.dept_id
- where t.dept_id =#{deptId} and date_format(t.create_time,'%Y-%m') = #{date}
+ where t.dept_id = #{deptId}
+ <if test="date != null">
+ and date_format(t.create_time,'%Y-%m') = #{date}
+ </if>
+ <if test="quarter != null and quarter.size > 0">
+ and date_format(t.create_time, '%Y-%m') between #{quarter[0]} and #{quarter[1]}
+ </if>
${params.dataScope}
</select>
@@ -117,21 +123,49 @@
<select id="selectCheckScoreMap" resultType="com.ycl.platform.domain.entity.CheckScore">
SELECT
+ id,
tcs.dept_id,
examine_category,
- ROUND(AVG(score), 2) AS score,
- #{startDate} AS startDate,
- #{endDate} AS endDate,
- ANY_VALUE(tcs.create_time) AS createTime
+ ROUND(AVG(score) OVER(PARTITION BY tcs.dept_id, examine_category), 2) AS score,
+ tcs.create_time AS createTime
FROM
t_check_score tcs
LEFT JOIN sys_dept d ON tcs.dept_id = d.dept_id
WHERE
examine_tag = #{examineTag}
- AND tcs.create_time BETWEEN #{startDate} AND #{endDate}
- GROUP BY
- tcs.dept_id,
- examine_category
+ AND DATE_FORMAT(tcs.create_time, '%Y-%m') BETWEEN DATE_FORMAT(#{startDate}, '%Y-%m') AND DATE_FORMAT(#{endDate}, '%Y-%m')
+ </select>
+
+ <select id="home" resultType="java.util.Map">
+ <![CDATA[
+ SELECT
+ DATE_FORMAT(cs.create_time, '%Y-%m-%d %h:%i:%s') AS createTime,
+ d.area,
+ CASE WHEN cs.examine_tag = '0' 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
+ ORDER BY cs.create_time DESC
+ ]]>
+ </select>
+
+ <select id="calculate" resultType="java.util.Map">
+ SELECT
+ area AS deptName,
+ ROUND(AVG(score)) AS score
+ FROM
+ t_check_score tcs
+ LEFT JOIN sys_dept d ON tcs.dept_id = d.dept_id
+ WHERE
+ examine_tag = 1
+ AND examine_category = #{category}
+ AND DATE_FORMAT(tcs.create_time, '%Y-%m') BETWEEN DATE_FORMAT(#{startDate}, '%Y-%m') AND DATE_FORMAT(#{endDate}, '%Y-%m')
+ GROUP BY tcs.dept_id
+ ORDER BY score DESC, tcs.dept_id
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0