From da6410b1823f95a447869d9b4fdaed32a62b4518 Mon Sep 17 00:00:00 2001
From: 叶松 <2217086471@qq.com>
Date: 星期一, 30 十月 2023 16:05:30 +0800
Subject: [PATCH] 模具修改
---
hd/pipe/StaffManage/src/main/resources/mapping/PlatUserMapper.xml | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/hd/pipe/StaffManage/src/main/resources/mapping/PlatUserMapper.xml b/hd/pipe/StaffManage/src/main/resources/mapping/PlatUserMapper.xml
index bca8d0f..4591523 100644
--- a/hd/pipe/StaffManage/src/main/resources/mapping/PlatUserMapper.xml
+++ b/hd/pipe/StaffManage/src/main/resources/mapping/PlatUserMapper.xml
@@ -736,6 +736,12 @@
<if test="oriStr!=null and oriStr !=''">
ori_str,
</if>
+ <if test="cmpType!=null and cmpType !=''">
+ cmp_type,
+ </if>
+ <if test="captureScore!=null and captureScore !=''">
+ capture_score,
+ </if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
#{id},
@@ -759,6 +765,12 @@
</if>
<if test="oriStr!=null and oriStr !=''">
#{oriStr},
+ </if>
+ <if test="cmpType!=null and cmpType !=''">
+ #{cmpType},
+ </if>
+ <if test="captureScore!=null and captureScore !=''">
+ #{captureScore},
</if>
</trim>
@@ -846,14 +858,19 @@
<select id="queryDoorUser" resultType="com.thhy.staff.modules.biz.platuser.entity.DoorUserVo">
- select fr.create_time,fr.employee_no_string as jobNum,spu.real_name as realName,sg.group_name as groupName,1 as staffStatus
+ select fr.id,fr.create_time,fr.employee_no_string as userId,fd.through_type,spu.real_name as realName,spu.job_num as jobNum,sg.group_name as groupName,1 as staffStatus
from t_face_record fr
- left join sys_plat_user spu on spu.job_num = fr.employee_no_string
+ left join t_face_device fd on fd.dev_sno = fr.mac_address
+ left join sys_plat_user spu on spu.user_id = fr.employee_no_string
left join sys_group_user sgu on spu.user_id = sgu.user_id
left join sys_group sg on sg.group_id = sgu.group_id
- where fr.notice_type = 5 and fr.verify = 1 and (fr.mac_address='e0:ca:3c:f0:d9:3a' or fr.mac_address = 'e0:ca:3c:f0:a7:34' or fr.mac_address = 'e0:ca:3c:f0:d9:3b')
+ where fr.verify = 1 and fd.through_type = 2
order by fr.create_time desc
limit 10
+ </select>
+
+ <select id="queryOriStrById" resultType="string">
+ select ori_str from t_face_record where id = #{id}
</select>
<select id="countInDoorUserToday" resultType="int">
@@ -895,7 +912,7 @@
</select>
<select id="queryUserFaceSingle" resultType="com.thhy.staff.modules.biz.face.entity.UserFaceVo">
- select user_id as userId,real_name as realName,sex,photo as templateImgUrl
+ select user_id as userId,real_name as realName,sex,photo
from sys_plat_user spu
where user_id = #{userId}
</select>
--
Gitblit v1.9.3