From 81ba6f3ea498c43010f47c7ed6d6c0f121bb1f09 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期六, 24 八月 2024 14:38:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/resources/mapper/zgyw/CheckIndexFaceMapper.xml | 54 +++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 47 insertions(+), 7 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/CheckIndexFaceMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CheckIndexFaceMapper.xml
index 37b36f7..8570bc1 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/CheckIndexFaceMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/CheckIndexFaceMapper.xml
@@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ycl.platform.mapper.CheckIndexFaceMapper">
-
+
<resultMap type="com.ycl.platform.domain.entity.CheckIndexFace" id="CheckIndexFaceResult">
<result property="id" column="id" />
<result property="deptId" column="dept_id" />
@@ -26,10 +26,11 @@
<select id="selectCheckIndexFaceList" resultMap="CheckIndexFaceResult">
select tcif.*,sd.dept_name
from t_check_index_face tcif left join sys_dept sd on tcif.dept_id = sd.dept_id
- <where>
- <if test="deptId != null "> and dept_id = #{deptId}</if>
+ <where>
+ <if test="deptId != null "> and tcif.dept_id = #{deptId}</if>
<if test="examineTag != null "> and 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="viewConnectStability != null "> and view_connect_stability = #{viewConnectStability}</if>
<if test="siteOnline != null "> and site_online = #{siteOnline}</if>
<if test="deviceDirectoryConsistent != null "> and device_directory_consistent = #{deviceDirectoryConsistent}</if>
@@ -38,14 +39,19 @@
<if test="faceTimingAccuracy != null "> and face_timing_accuracy = #{faceTimingAccuracy}</if>
<if test="faceUploadTimeliness != null "> and face_upload_timeliness = #{faceUploadTimeliness}</if>
<if test="facePictureAvailability != null "> and face_picture_availability = #{facePictureAvailability}</if>
+ <if test="deptIds != null ">and tcif.dept_id in
+ <foreach collection="deptIds" separator="," open="(" close=")" item="deptId">
+ #{deptId}
+ </foreach>
+ </if>
</where>
</select>
-
+
<select id="selectCheckIndexFaceById" resultMap="CheckIndexFaceResult">
<include refid="selectCheckIndexFaceVo"/>
where id = #{id}
</select>
-
+
<insert id="insertCheckIndexFace" useGeneratedKeys="true" keyProperty="id">
insert into t_check_index_face
<trim prefix="(" suffix=")" suffixOverrides=",">
@@ -99,9 +105,43 @@
</delete>
<delete id="deleteCheckIndexFaceByIds" >
- delete from t_check_index_face where id in
+ delete from t_check_index_face where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
-</mapper>
\ No newline at end of file
+
+ <select id="selectToday" resultType="com.ycl.platform.domain.entity.CheckIndexFace">
+ select * from t_check_index_face where DATE(create_time) = #{today}
+ </select>
+
+ <select id="dashboard" resultType="com.ycl.platform.domain.entity.CheckIndexFace">
+ SELECT
+ IFNULL(ROUND(AVG(view_connect_stability * 100), 0), 0) AS view_connect_stability,
+ IFNULL(ROUND(AVG(site_online * 100), 0), 0) AS site_online,
+ IFNULL(ROUND(AVG(device_directory_consistent * 100), 0), 0) AS device_directory_consistent,
+ IFNULL(ROUND(AVG(face_information_collection_accuracy * 100), 0), 0) AS face_information_collection_accuracy,
+ IFNULL(ROUND(AVG(face_picture_qualification * 100), 0), 0) AS face_picture_qualification,
+ IFNULL(ROUND(AVG(face_timing_accuracy * 100), 0), 0) AS face_timing_accuracy,
+ IFNULL(ROUND(AVG(face_upload_timeliness * 100), 0), 0) AS face_upload_timeliness,
+ IFNULL(ROUND(AVG(face_picture_availability * 100), 0), 0) AS face_picture_availability
+ FROM
+ t_check_index_face
+ <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>
+ </select>
+</mapper>
--
Gitblit v1.8.0