From 79df43ee4a40f48cb061249ebe2bd9a46966ecd9 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 16 八月 2024 10:29:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml | 130 +++++++++++++++++++++++++++++++++++--------
1 files changed, 105 insertions(+), 25 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml
index 5154ce6..6096ce2 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml
@@ -8,30 +8,36 @@
<result property="id" column="id" />
<result property="score" column="score" />
<result property="deptId" column="dept_id" />
- <result property="publishId" column="publish_id" />
- <result property="ruleId" column="rule_id" />
+ <result property="templateId" column="template_id" />
+ <result property="examineTag" column="examine_tag" />
<result property="examineCategory" column="examine_category" />
<result property="createTime" column="create_time" />
+ <result property="updateTime" column="update_time" />
<result property="updateUser" column="update_user" />
- <result property="updateUserName" column="update_user_name" />
- <result property="auditState" column="audit_state" />
+ <result property="publish" column="publish" />
</resultMap>
<sql id="selectCheckScoreVo">
- select id, score, dept_id, publish_id, rule_id, examine_category, create_time, update_user, update_user_name, audit_state 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="deptId != null "> and dept_id = #{deptId}</if>
- <if test="publishId != null "> and publish_id = #{publishId}</if>
- <if test="ruleId != null "> and rule_id = #{ruleId}</if>
+ <where>
+ <if test="score != null "> and score = #{score}</if>
+ <if test="templateId != null "> and template_id = #{templateId}</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="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>
- <select id="selectCheckScoreById" resultMap="CheckScoreResult">
+ <select id="selectCheckScoreById" parameterType="Long" resultMap="CheckScoreResult">
<include refid="selectCheckScoreVo"/>
where id = #{id}
</select>
@@ -41,51 +47,125 @@
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="score != null">score,</if>
<if test="deptId != null">dept_id,</if>
- <if test="publishId != null">publish_id,</if>
- <if test="ruleId != null">rule_id,</if>
+ <if test="templateId != null">template_id,</if>
+ <if test="examineTag != null">examine_tag,</if>
<if test="examineCategory != null">examine_category,</if>
<if test="createTime != null">create_time,</if>
+ <if test="updateTime != null">update_time,</if>
<if test="updateUser != null">update_user,</if>
- <if test="updateUserName != null">update_user_name,</if>
- <if test="auditState != null">audit_state,</if>
+ <if test="publish != null">publish,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="score != null">#{score},</if>
<if test="deptId != null">#{deptId},</if>
- <if test="publishId != null">#{publishId},</if>
- <if test="ruleId != null">#{ruleId},</if>
+ <if test="templateId != null">#{templateId},</if>
+ <if test="examineTag != null">#{examineTag},</if>
<if test="examineCategory != null">#{examineCategory},</if>
<if test="createTime != null">#{createTime},</if>
+ <if test="updateTime != null">#{updateTime},</if>
<if test="updateUser != null">#{updateUser},</if>
- <if test="updateUserName != null">#{updateUserName},</if>
- <if test="auditState != null">#{auditState},</if>
+ <if test="publish != null">#{publish},</if>
</trim>
</insert>
- <update id="updateCheckScore">
+ <update id="updateCheckScore" >
update t_check_score
<trim prefix="SET" suffixOverrides=",">
<if test="score != null">score = #{score},</if>
<if test="deptId != null">dept_id = #{deptId},</if>
- <if test="publishId != null">publish_id = #{publishId},</if>
- <if test="ruleId != null">rule_id = #{ruleId},</if>
+ <if test="templateId != null">template_id = #{templateId},</if>
+ <if test="examineTag != null">examine_tag = #{examineTag},</if>
<if test="examineCategory != null">examine_category = #{examineCategory},</if>
<if test="createTime != null">create_time = #{createTime},</if>
+ <if test="updateTime != null">update_time = #{updateTime},</if>
<if test="updateUser != null">update_user = #{updateUser},</if>
- <if test="updateUserName != null">update_user_name = #{updateUserName},</if>
- <if test="auditState != null">audit_state = #{auditState},</if>
+ <if test="publish != null">publish = #{publish},</if>
</trim>
where id = #{id}
</update>
- <delete id="deleteCheckScoreById" >
+ <delete id="deleteCheckScoreById" parameterType="Long">
delete from t_check_score where id = #{id}
</delete>
- <delete id="deleteCheckScoreByIds" >
+ <delete id="deleteCheckScoreByIds" parameterType="String">
delete from t_check_score where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
+
+ <update id="publishCheckScore">
+ update t_check_score set publish = #{publish},update_time =#{updateTime},update_user= #{updateUser} where id in
+ <foreach collection="id" item="id" open="(" close=")" separator=",">
+ #{id}
+ </foreach>
+ </update>
+
+ <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}
+ <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>
+
+ <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
+ dept_name 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