From 66e9e037d7c3b97880a57693b8d3fabf3f0a8dcb Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 30 九月 2024 00:52:54 +0800
Subject: [PATCH] 合同考核点位在线率调整
---
ycl-server/src/main/resources/mapper/zgyw/CheckIndexVideoMapper.xml | 33 ++++++++++++++++++++++++++-------
1 files changed, 26 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..09c601b 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,23 @@
#{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="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}
@@ -164,8 +177,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