From b925491b50fd2cd3c85223b056bd7246e86a7f39 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 01 八月 2024 09:15:59 +0800
Subject: [PATCH] 优云tenantId
---
ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 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..2bc0f1f 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>
@@ -119,9 +125,10 @@
SELECT
tcs.dept_id,
examine_category,
- AVG(score) AS score,
+ ROUND(AVG(score), 2) AS score,
#{startDate} AS startDate,
- #{endDate} AS endDate
+ #{endDate} AS endDate,
+ ANY_VALUE(tcs.create_time) AS createTime
FROM
t_check_score tcs
LEFT JOIN sys_dept d ON tcs.dept_id = d.dept_id
--
Gitblit v1.8.0