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/CheckIndexFaceMapper.xml | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/CheckIndexFaceMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CheckIndexFaceMapper.xml
index fa8afc6..0c10fd7 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/CheckIndexFaceMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/CheckIndexFaceMapper.xml
@@ -8,6 +8,8 @@
<result property="id" column="id" />
<result property="deptId" column="dept_id" />
<result property="examineTag" column="examine_tag" />
+ <result property="num" column="num" />
+ <result property="score" column="score" />
<result property="createTime" column="create_time" />
<result property="viewConnectStability" column="view_connect_stability" />
<result property="siteOnline" column="site_online" />
@@ -24,13 +26,16 @@
</sql>
<select id="selectCheckIndexFaceList" resultMap="CheckIndexFaceResult">
- select tcif.*,sd.dept_name,tcs.score
+ select tcif.*,sd.dept_name,tcs.score,count(m.serial_number) as num
from t_check_index_face tcif left join sys_dept sd on tcif.dept_id = sd.dept_id
left join t_check_score tcs on tcif.id = tcs.index_id
+ left join t_yw_point p on p.dept_id = tcif.dept_id
+ left join t_monitor m on p.serial_number = m.serial_number
<where>
- tcs.examine_category = 3
+ tcs.examine_category = 3 and m.camera_fun_type like concat('%',3,'%')
<if test="deptId != null "> and tcif.dept_id = #{deptId}</if>
<if test="examineTag != null "> and tcif.examine_tag = #{examineTag}</if>
+ <if test="examineTagQuery != null "> and p.province_tag = #{examineTagQuery}</if>
<if test="date != null "> and date_format(tcif.create_time,'%Y-%m') = #{date}</if>
<if test="day != null "> and date(tcif.create_time) = #{day}</if>
<if test="params.publish != null and params.publish != ''">and tcif.publish = #{params.publish}</if>
@@ -39,13 +44,9 @@
#{deptId}
</foreach>
</if>
- <if test="examineTags != null and examineTags.size()>0">and tcif.examine_tag in
- <foreach collection="examineTags" separator="," open="(" close=")" item="examineTag">
- #{examineTag}
- </foreach>
- </if>
</where>
- order by tcif.examine_tag desc,tcif.create_time,tcs.score desc
+ group by tcif.id
+ order by tcif.examine_tag desc,sd.area_code,tcif.create_time
</select>
<select id="getCheckIndexFaceList" resultMap="CheckIndexFaceResult">
@@ -53,7 +54,6 @@
from t_check_index_face tcif left join sys_dept sd on tcif.dept_id = sd.dept_id
<where>
<if test="examineTag != null "> and tcif.examine_tag = #{examineTag}</if>
- <if test="date != null "> and date_format(tcif.create_time,'%Y-%m') = #{date}</if>
<if test="day != null "> and date(tcif.create_time) = #{day}</if>
<if test="deptIds != null ">and tcif.dept_id in
<foreach collection="deptIds" separator="," open="(" close=")" item="deptId">
@@ -148,8 +148,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