From 8e49eae6b1c33e0a02742af2657a1f2c0b89d95b Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 06 八月 2024 17:46:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml | 45 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 39 insertions(+), 6 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml
index de4ffb3..ae68b76 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml
@@ -18,20 +18,22 @@
</resultMap>
<sql id="selectCheckScoreVo">
- select id, score, dept_id, template_id, examine_tag, examine_category, create_time,update_time,update_user, publish from t_check_score
+ select id, score, tcs.dept_id, template_id, examine_tag, examine_category, tcs.create_time,tcs.update_time,tcs.update_user, publish
+ from t_check_score tcs left join sys_dept d on tcs.dept_id = d.dept_id
</sql>
<select id="selectCheckScoreList" resultMap="CheckScoreResult">
<include refid="selectCheckScoreVo"/>
<where>
<if test="score != null "> and score = #{score}</if>
- <if test="deptId != null "> and dept_id = #{deptId}</if>
<if test="templateId != null "> and template_id = #{templateId}</if>
- <if test="createTime != null "> and DATE(create_time) = #{createTime}</if>
- <if test="date != null "> and date_format(create_time,'%Y-%m') = #{date}</if>
+ <if test="createTime != null "> and DATE(tcs.create_time) = #{createTime}</if>
+ <if test="date != null "> and date_format(tcs.create_time,'%Y-%m') = #{date}</if>
<if test="examineTag != null "> and examine_tag = #{examineTag}</if>
<if test="examineCategory != null "> and examine_category = #{examineCategory}</if>
- <if test="publish != null and publish != ''"> and publish = #{publish}</if>
+ <if test="params.publish != null and params.publish != ''"> and publish = #{params.publish}</if>
+ <if test="deptId != null "> and tcs.dept_id = #{deptId}</if>
+ ${params.dataScope}
</where>
</select>
@@ -101,6 +103,37 @@
</update>
<select id="selectScoreIndex" resultType="java.util.Map">
- select * from ${tableName} where dept_id =#{deptId} and date_format(create_time,'%Y-%m') = #{date}
+ select t.* from ${tableName} t
+ left join sys_dept d on t.dept_id = d.dept_id
+ 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>
+
+ <insert id="saveBatch">
+ insert into t_check_score (score,dept_id,template_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})
+ </foreach>
+ </insert>
+
+ <select id="selectCheckScoreMap" resultType="com.ycl.platform.domain.entity.CheckScore">
+ SELECT
+ id,
+ tcs.dept_id,
+ examine_category,
+ 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 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