From d5c2dc44df6e6442b3bb5033cd9ca116777aecbc Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期一, 09 九月 2024 17:47:08 +0800 Subject: [PATCH] 考核指标代码调整 --- ycl-server/src/main/resources/mapper/zgyw/CheckIndexVideoMapper.xml | 76 ++++++++++++++++++++++++-------------- 1 files changed, 48 insertions(+), 28 deletions(-) diff --git a/ycl-server/src/main/resources/mapper/zgyw/CheckIndexVideoMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CheckIndexVideoMapper.xml index 0dbd85f..4790df7 100644 --- a/ycl-server/src/main/resources/mapper/zgyw/CheckIndexVideoMapper.xml +++ b/ycl-server/src/main/resources/mapper/zgyw/CheckIndexVideoMapper.xml @@ -15,8 +15,8 @@ <result property="archivesRate" column="archives_rate" /> <result property="siteOnline" column="site_online" /> <result property="videoAvailable" column="video_available" /> - <result property="annotationAccuracy" column="annotation_accuracy" /> - <result property="timingAccuracy" column="timing_accuracy" /> + <result property="ministrySiteOnline" column="ministry_site_online" /> + <result property="ministryVideoAvailable" column="ministry_video_available" /> <result property="keySiteOnline" column="key_site_online" /> <result property="keyVideoAvailable" column="key_video_available" /> <result property="keyAnnotationAccuracy" column="key_annotation_accuracy" /> @@ -26,40 +26,48 @@ </resultMap> <sql id="selectCheckIndexVideoVo"> - select id, dept_id, create_time, examine_tag, platform_online, monitor_qualification, monitor_registration, archives_rate, site_online, video_available, annotation_accuracy, timing_accuracy, key_site_online, key_video_available, key_annotation_accuracy, key_timing_accuracy, key_command_image_online,image_resource_security from t_check_index_video + select id, dept_id, create_time, examine_tag, platform_online, monitor_qualification, monitor_registration, archives_rate, site_online, video_available, ministry_site_online, ministry_video_available, key_site_online, key_video_available, key_annotation_accuracy, key_timing_accuracy, key_command_image_online,image_resource_security from t_check_index_video </sql> <select id="selectCheckIndexVideoList" parameterType="CheckIndexVideo" resultMap="CheckIndexVideoResult"> - select tciv.*,sd.dept_name + select tciv.*,sd.dept_name,tcs.score from t_check_index_video tciv left join sys_dept sd on tciv.dept_id = sd.dept_id + left join t_check_score tcs on tciv.id = tcs.index_id <where> + tcs.examine_category = 1 <if test="deptId != null "> and tciv.dept_id = #{deptId}</if> - <if test="examineTag != null "> and examine_tag = #{examineTag}</if> + <if test="examineTag != null "> and tciv.examine_tag = #{examineTag}</if> <if test="date != null "> and date_format(tciv.create_time,'%Y-%m') = #{date}</if> <if test="day != null "> and date(tciv.create_time) = #{day}</if> <if test="createTime != null "> and date(tciv.create_time) = #{createTime}</if> - <if test="platformOnline != null "> and platform_online = #{platformOnline}</if> - <if test="monitorQualification != null "> and monitor_qualification = #{monitorQualification}</if> - <if test="monitorRegistration != null "> and monitor_registration = #{monitorRegistration}</if> - <if test="archivesRate != null "> and archives_rate = #{archivesRate}</if> - <if test="siteOnline != null "> and site_online = #{siteOnline}</if> - <if test="videoAvailable != null "> and video_available = #{videoAvailable}</if> - <if test="annotationAccuracy != null "> and annotation_accuracy = #{annotationAccuracy}</if> - <if test="timingAccuracy != null "> and timing_accuracy = #{timingAccuracy}</if> - <if test="keySiteOnline != null "> and key_site_online = #{keySiteOnline}</if> - <if test="keyVideoAvailable != null "> and key_video_available = #{keyVideoAvailable}</if> - <if test="keyAnnotationAccuracy != null "> and key_annotation_accuracy = #{keyAnnotationAccuracy}</if> - <if test="keyTimingAccuracy != null "> and key_timing_accuracy = #{keyTimingAccuracy}</if> - <if test="keyCommandImageOnline != null "> and key_command_image_online = #{keyCommandImageOnline}</if> - <if test="imageResourceSecurity != null "> and image_resource_security = #{imageResourceSecurity}</if> + <if test="params.publish != null and params.publish != ''">and tciv.publish = #{params.publish}</if> <if test="deptIds != null ">and tciv.dept_id in <foreach collection="deptIds" separator="," open="(" close=")" item="deptId"> #{deptId} </foreach> </if> + <if test="examineTags != null and examineTags.size()>0">and tciv.examine_tag in + <foreach collection="examineTags" separator="," open="(" close=")" item="examineTag"> + #{examineTag} + </foreach> + </if> + </where> + order by tciv.examine_tag desc,tciv.create_time,tcs.score desc + </select> + <select id="getCheckIndexVideoList" parameterType="CheckIndexVideo" resultMap="CheckIndexVideoResult"> + select tciv.*,sd.dept_name + from t_check_index_video tciv left join sys_dept sd on tciv.dept_id = sd.dept_id + <where> + <if test="examineTag != null "> and tciv.examine_tag = #{examineTag}</if> + <if test="day != null "> and date(tciv.create_time) = #{day}</if> + <if test="createTime != null "> and date(tciv.create_time) = #{createTime}</if> + <if test="deptIds != null ">and tciv.dept_id in + <foreach collection="deptIds" separator="," open="(" close=")" item="deptId"> + #{deptId} + </foreach> + </if> </where> </select> - <select id="selectCheckIndexVideoById" resultMap="CheckIndexVideoResult"> <include refid="selectCheckIndexVideoVo"/> where id = #{id} @@ -77,8 +85,8 @@ <if test="archivesRate != null">archives_rate,</if> <if test="siteOnline != null">site_online,</if> <if test="videoAvailable != null">video_available,</if> - <if test="annotationAccuracy != null">annotation_accuracy,</if> - <if test="timingAccuracy != null">timing_accuracy,</if> + <if test="ministrySiteOnline != null">ministry_site_online,</if> + <if test="ministryVideoAvailable != null">ministry_video_available,</if> <if test="keySiteOnline != null">key_site_online,</if> <if test="keyVideoAvailable != null">key_video_available,</if> <if test="keyAnnotationAccuracy != null">key_annotation_accuracy,</if> @@ -96,8 +104,8 @@ <if test="archivesRate != null">#{archivesRate},</if> <if test="siteOnline != null">#{siteOnline},</if> <if test="videoAvailable != null">#{videoAvailable},</if> - <if test="annotationAccuracy != null">#{annotationAccuracy},</if> - <if test="timingAccuracy != null">#{timingAccuracy},</if> + <if test="ministrySiteOnline != null">#{ministrySiteOnline},</if> + <if test="ministryVideoAvailable != null">#{ministryVideoAvailable},</if> <if test="keySiteOnline != null">#{keySiteOnline},</if> <if test="keyVideoAvailable != null">#{keyVideoAvailable},</if> <if test="keyAnnotationAccuracy != null">#{keyAnnotationAccuracy},</if> @@ -119,8 +127,8 @@ <if test="archivesRate != null">archives_rate = #{archivesRate},</if> <if test="siteOnline != null">site_online = #{siteOnline},</if> <if test="videoAvailable != null">video_available = #{videoAvailable},</if> - <if test="annotationAccuracy != null">annotation_accuracy = #{annotationAccuracy},</if> - <if test="timingAccuracy != null">timing_accuracy = #{timingAccuracy},</if> + <if test="ministrySiteOnline != null">ministry_site_online = #{ministrySiteOnline},</if> + <if test="ministryVideoAvailable != null">ministry_video_available = #{ministryVideoAvailable},</if> <if test="keySiteOnline != null">key_site_online = #{keySiteOnline},</if> <if test="keyVideoAvailable != null">key_video_available = #{keyVideoAvailable},</if> <if test="keyAnnotationAccuracy != null">key_annotation_accuracy = #{keyAnnotationAccuracy},</if> @@ -154,8 +162,8 @@ IFNULL(ROUND(AVG(archives_rate * 100), 0), 0) AS archives_rate, IFNULL(ROUND(AVG(site_online * 100), 0), 0) AS site_online, IFNULL(ROUND(AVG(video_available * 100), 0), 0) AS video_available, - IFNULL(ROUND(AVG(annotation_accuracy * 100), 0), 0) AS annotation_accuracy, - IFNULL(ROUND(AVG(timing_accuracy * 100), 0), 0) AS timing_accuracy, + IFNULL(ROUND(AVG(ministry_site_online * 100), 0), 0) AS ministry_site_online, + IFNULL(ROUND(AVG(ministry_video_available * 100), 0), 0) AS ministry_video_available, IFNULL(ROUND(AVG(key_site_online * 100), 0), 0) AS key_site_online, IFNULL(ROUND(AVG(key_video_available * 100), 0), 0) AS key_video_available, IFNULL(ROUND(AVG(key_annotation_accuracy * 100), 0), 0) AS key_annotation_accuracy, @@ -207,4 +215,16 @@ WHERE rn = 1; </select> + + <select id="selectLastOneByDept" resultType="com.ycl.platform.domain.dto.ImageResourceDTO"> + WITH temp AS ( + SELECT + image_resource_security AS imageResourceSecurity, + dept_id AS deptId, + ROW_NUMBER() OVER(PARTITION BY dept_id ORDER BY create_time DESC, image_resource_security DESC) AS num + FROM + t_check_index_video + ) + SELECT deptId, imageResourceSecurity FROM temp WHERE num = 1; + </select> </mapper> -- Gitblit v1.8.0