From 3848c5677aefdb201c24d615a7c2ad03fd5154e6 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 06 九月 2024 00:18:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/resources/mapper/zgyw/CheckIndexFaceMapper.xml | 16 +++++++---------
1 files changed, 7 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 01203f4..abd8b07 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/CheckIndexFaceMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/CheckIndexFaceMapper.xml
@@ -24,27 +24,25 @@
</sql>
<select id="selectCheckIndexFaceList" resultMap="CheckIndexFaceResult">
- select tcif.*,sd.dept_name
+ select tcif.*,sd.dept_name,tcs.score
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
<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>
- <if test="faceInformationCollectionAccuracy != null "> and face_information_collection_accuracy = #{faceInformationCollectionAccuracy}</if>
- <if test="facePictureQualification != null "> and face_picture_qualification = #{facePictureQualification}</if>
- <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="params.publish != null and params.publish != ''">and publish = #{params.publish}</if>
<if test="deptIds != null ">and tcif.dept_id in
<foreach collection="deptIds" separator="," open="(" close=")" item="deptId">
#{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>
</select>
--
Gitblit v1.8.0