From 9b55891e6dd57bc244e6c5654434b32e05c83496 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 25 九月 2024 15:10:25 +0800
Subject: [PATCH] 异常监控排除已经审核过的工单作为状态

---
 ycl-server/src/main/resources/mapper/zgyw/CheckIndexVideoMapper.xml |   50 ++++++++++++++++++++++++++++++++------------------
 1 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/ycl-server/src/main/resources/mapper/zgyw/CheckIndexVideoMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CheckIndexVideoMapper.xml
index eb5d13e..c66973c 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,37 +32,43 @@
     </sql>
 
     <select id="selectCheckIndexVideoList" parameterType="CheckIndexVideo" resultMap="CheckIndexVideoResult">
-        select tciv.*,sd.dept_name
+        select tciv.*,sd.dept_name,tcs.score,count(m.serial_number) 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
+        left join t_yw_point p on p.dept_id = tciv.dept_id
+        left join t_monitor m on p.serial_number = m.serial_number
         <where>
+            tcs.examine_category = 1 and m.camera_fun_type like concat('%',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="examineTagQuery != null "> and p.province_tag = #{examineTagQuery}</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="ministrySiteOnline != null "> and ministry_site_online = #{ministrySiteOnline}</if>
-            <if test="ministryVideoAvailable != null "> and ministry_video_available = #{ministryVideoAvailable}</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 publish = #{params.publish}</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>
         </where>
+        group by tciv.id
+        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
+        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}
@@ -170,8 +178,14 @@
                 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

--
Gitblit v1.8.0