From 7a33c5b558e7e4ab5760261accbd32c7f2056c4a Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 23 九月 2024 19:16:13 +0800
Subject: [PATCH] 大屏分离平台在线和考核成绩接口

---
 ycl-server/src/main/resources/mapper/zgyw/CheckIndexVideoMapper.xml |   28 +++++++++++++++++++++-------
 1 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/ycl-server/src/main/resources/mapper/zgyw/CheckIndexVideoMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CheckIndexVideoMapper.xml
index 154b927..c6d6db9 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,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
+            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 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>
@@ -46,15 +51,24 @@
                 #{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}
+        </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>
-        order by tciv.examine_tag desc,tciv.create_time,tcs.score desc
     </select>
-
     <select id="selectCheckIndexVideoById"  resultMap="CheckIndexVideoResult">
         <include refid="selectCheckIndexVideoVo"/>
         where id = #{id}

--
Gitblit v1.8.0