考核bug修复、详情页加切换

fuliqi

2024-09-03 ab744742edfd1b402dbbe326acba110db8d0b8ac

 ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml

@@ -1,38 +1,39 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
        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"    />
        <result property="deptId"    column="dept_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="publish"    column="publish"    />
        <result property="id" column="id"/>
        <result property="score" column="score"/>
        <result property="deptId" column="dept_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="publish" column="publish"/>
    </resultMap>

    <sql id="selectCheckScoreVo">
        select id, score, tcs.dept_id, template_id, examine_tag, examine_category, tcs.create_time,tcs.update_time,tcs.update_user, publish
        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="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>
            <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>
        order by create_time desc
@@ -55,7 +56,7 @@
            <if test="updateTime != null">update_time,</if>
            <if test="updateUser != null">update_user,</if>
            <if test="publish != null">publish,</if>
         </trim>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="score != null">#{score},</if>
            <if test="deptId != null">#{deptId},</if>
@@ -66,10 +67,10 @@
            <if test="updateTime != null">#{updateTime},</if>
            <if test="updateUser != null">#{updateUser},</if>
            <if test="publish != null">#{publish},</if>
         </trim>
        </trim>
    </insert>

    <update id="updateCheckScore" >
    <update id="updateCheckScore">
        update t_check_score
        <trim prefix="SET" suffixOverrides=",">
            <if test="score != null">score = #{score},</if>
@@ -120,27 +121,41 @@
    </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 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
        id,
        tcs.dept_id,
        examine_category,
        ROUND(AVG(score) OVER(PARTITION BY tcs.dept_id, examine_category), 2) AS score,
        tcs.publish,
        tcs.create_time AS createTime
        FROM
            t_check_score tcs
                LEFT JOIN sys_dept d ON tcs.dept_id = d.dept_id
        WHERE
        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')
        GROUP BY tcs.dept_id, examine_category,examine_tag
</select>
            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>
            ${params.dataScope}
        </where>
        GROUP BY tcs.dept_id, tcs.examine_category, tcs.examine_tag
    </select>

    <select id="getLast" resultType="com.ycl.platform.domain.entity.CheckScore">
        select * from t_check_score tcs  LEFT JOIN sys_dept d ON tcs.dept_id = d.dept_id
        <where>
            tcs.examine_tag = #{examineTag}
            <if test="params.publish != null  and params.publish != ''">and tcs.publish = #{params.publish}</if>
            ${params.dataScope}
        </where>
        order by tcs.create_time desc limit 1
    </select>
    <select id="home" resultType="java.util.Map">
        <![CDATA[
        SELECT
@@ -160,15 +175,16 @@

    <select id="calculate" resultType="java.util.Map">
        SELECT
            area AS deptName,
            ROUND(AVG(score)) AS score
        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
        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')
        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>