From 82137fdbb4fc7d990b6f4d91f33ca80becad4545 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 01 八月 2024 17:06:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml
index 12fb02b..ae68b76 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,20 +123,17 @@
<select id="selectCheckScoreMap" resultType="com.ycl.platform.domain.entity.CheckScore">
SELECT
+ id,
tcs.dept_id,
examine_category,
- AVG(score) AS score,
- #{startDate} AS startDate,
- #{endDate} AS endDate
+ 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>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0