From a5249103ab0fb44afe898a7be309412e7cfb1906 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 17 九月 2024 11:53:55 +0800
Subject: [PATCH] 工单图片在详情中展示
---
ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 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..0d89d89 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">
--
Gitblit v1.8.0