From 99b53c056b309b935c8eb23a0ddf244bd4f4df96 Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期日, 01 九月 2024 21:54:32 +0800 Subject: [PATCH] 报备功能优化 --- ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml | 30 ++++++++++++++++++++++++------ 1 files changed, 24 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 6c5fa75..8eeb9a8 100644 --- a/ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml +++ b/ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.ycl.platform.mapper.CheckScoreMapper"> - + <resultMap type="com.ycl.platform.domain.entity.CheckScore" id="CheckScoreResult"> <result property="id" column="id" /> <result property="score" column="score" /> @@ -35,13 +35,14 @@ <if test="deptId != null "> and tcs.dept_id = #{deptId}</if> ${params.dataScope} </where> + order by create_time desc; </select> - + <select id="selectCheckScoreById" parameterType="Long" resultMap="CheckScoreResult"> <include refid="selectCheckScoreVo"/> where id = #{id} </select> - + <insert id="insertCheckScore" useGeneratedKeys="true" keyProperty="id"> insert into t_check_score <trim prefix="(" suffix=")" suffixOverrides=","> @@ -89,7 +90,7 @@ </delete> <delete id="deleteCheckScoreByIds" parameterType="String"> - delete from t_check_score where id in + delete from t_check_score where id in <foreach item="id" collection="array" open="(" separator="," close=")"> #{id} </foreach> @@ -137,6 +138,7 @@ </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, @@ -147,8 +149,24 @@ 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 + WHERE cs.score < ct.alarm_score ORDER BY cs.create_time DESC + ]]> </select> -</mapper> \ No newline at end of file + <select id="calculate" resultType="java.util.Map"> + SELECT + area 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> -- Gitblit v1.8.0