From fea22e82e7e49691f6e0c20a29b228d0ab3173e9 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期三, 29 十月 2025 17:08:38 +0800
Subject: [PATCH] 修改问题
---
ycl-server/src/main/resources/mapper/zgyw/CheckIndexVideoMapper.xml | 60 +++++++++++++++++++++++++++++++++++-------------------------
1 files changed, 35 insertions(+), 25 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/CheckIndexVideoMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CheckIndexVideoMapper.xml
index 4790df7..b6311e1 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/CheckIndexVideoMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/CheckIndexVideoMapper.xml
@@ -8,6 +8,8 @@
<result property="id" column="id" />
<result property="deptId" column="dept_id" />
<result property="createTime" column="create_time" />
+ <result property="num" column="num" />
+ <result property="score" column="score" />
<result property="examineTag" column="examine_tag" />
<result property="platformOnline" column="platform_online" />
<result property="monitorQualification" column="monitor_qualification" />
@@ -30,13 +32,16 @@
</sql>
<select id="selectCheckIndexVideoList" parameterType="CheckIndexVideo" resultMap="CheckIndexVideoResult">
- select tciv.*,sd.dept_name,tcs.score
+ select tciv.*,sd.dept_name,tcs.score,IFNULL(tcs.device_count,0) as num
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 tciv.examine_tag = #{examineTag}</if>
+ <if test="quarter != null and quarter.size > 0">
+ and date_format(tcs.create_time, '%Y-%m') between #{quarter[0]} and #{quarter[1]}
+ </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>
@@ -46,13 +51,8 @@
#{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
+ order by tciv.examine_tag desc,sd.area_code,tciv.create_time
</select>
<select id="getCheckIndexVideoList" parameterType="CheckIndexVideo" resultMap="CheckIndexVideoResult">
select tciv.*,sd.dept_name
@@ -60,7 +60,6 @@
<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}
@@ -155,6 +154,27 @@
</select>
<select id="dashboard" resultType="com.ycl.platform.domain.entity.CheckIndexVideo">
+ WITH LatestRecords AS (
+ SELECT *
+ FROM t_check_index_video
+ <where>
+ YEAR(create_time) = YEAR(CURRENT_DATE)
+ AND MONTH(create_time) = MONTH(CURRENT_DATE)
+ <if test="deptId != null">
+ AND dept_id = #{deptId}
+ </if>
+ <if test="dataScope == 1">
+ AND examine_tag = 0
+ </if>
+ <if test="dataScope == 2">
+ AND examine_tag = 1
+ </if>
+ <if test="dataScope == 3">
+ AND examine_tag = 2
+ </if>
+ </where>
+ ORDER BY create_time DESC
+ )
SELECT
IFNULL(ROUND(AVG(platform_online * 100), 0), 0) AS platform_online,
IFNULL(ROUND(AVG(monitor_qualification * 100), 0), 0) AS monitor_qualification,
@@ -171,25 +191,15 @@
IFNULL(ROUND(AVG(key_command_image_online * 100), 0), 0) AS key_command_image_online,
IFNULL(ROUND(AVG(image_resource_security * 100), 0), 0) AS image_resource_security
FROM
- t_check_index_video
- <where>
- <if test="deptId != null">
- AND dept_id = #{deptId}
- </if>
- <if test="dataScope == 1">
- AND examine_tag = 1
- </if>
- </where>
- ORDER BY
- create_time DESC
- <if test="deptId == null">
- LIMIT 7
- </if>
- <if test="deptId != null">
- LIMIT 1
- </if>
+ LatestRecords;
</select>
+ <select id="dashboard" resultType="com.ycl.platform.domain.entity.CheckIndexVideo">
+
+ </select>
+
+
+
<select id="selectAndDeptName" resultType="com.ycl.platform.domain.entity.CheckIndexVideo">
WITH temp AS (
SELECT
--
Gitblit v1.8.0