From aa8dbdc24e813592153a78ebd50424c9c9fe818d Mon Sep 17 00:00:00 2001 From: bingbo <bingbo1993@126.com> Date: 星期一, 27 十一月 2023 15:38:15 +0800 Subject: [PATCH] 加减钢筋笼库存 带记录 --- hd/pipe/StaffManage/src/main/resources/mapping/PlatUserMapper.xml | 44 ++++++++++++++++++++++++++++++++++++-------- 1 files changed, 36 insertions(+), 8 deletions(-) diff --git a/hd/pipe/StaffManage/src/main/resources/mapping/PlatUserMapper.xml b/hd/pipe/StaffManage/src/main/resources/mapping/PlatUserMapper.xml index 70a6c79..6ed1f03 100644 --- a/hd/pipe/StaffManage/src/main/resources/mapping/PlatUserMapper.xml +++ b/hd/pipe/StaffManage/src/main/resources/mapping/PlatUserMapper.xml @@ -858,7 +858,8 @@ <select id="queryDoorUser" resultType="com.thhy.staff.modules.biz.platuser.entity.DoorUserVo"> - 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 + select fr.id,fr.create_time as createTime,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,spu.photo from t_face_record fr 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 @@ -874,16 +875,13 @@ </select> <select id="countInDoorUserToday" resultType="int"> - select count(distinct fr.employee_no_string) - from t_face_record fr - left join sys_plat_user spu on spu.job_num = fr.employee_no_string - where fr.notice_type = 5 and fr.verify = 1 and spu.user_id is not null 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') - and DATE_FORMAT(sysdate(),'%Y-%m-%d') = DATE_FORMAT(fr.create_time,'%Y-%m-%d') + select count(employee_no_string) from t_face_record fr + where fr.verify = 1 and employee_no_string is not null and DATE_FORMAT(create_time,'%Y-%m-%d') = DATE_FORMAT(SYSDATE(),'%Y-%m-%d') </select> <select id="groupUserWorking" resultType="com.thhy.staff.modules.biz.platuser.entity.GroupWorking"> select sg.group_id as groupId,sg.group_name as groupName, - (select count(user_id) from sys_group_user where and is_use = 1 and group_id = sg.group_id) as groupUserCount + (select count(user_id) from sys_group_user where is_use = 1 and group_id = sg.group_id) as groupUserCount from sys_group sg left join sys_com_depart sd on sg.depart_id = sd.depart_id where sg.is_use = 1 and sd.company_id = #{companyId} @@ -894,7 +892,7 @@ from t_face_record fr left join sys_plat_user spu on spu.job_num = fr.employee_no_string left join sys_group_user sgu on sgu.user_id = spu.user_id and sgu.is_use = 1 - where sgu.group_id = #{groupId} and fr.notice_type = 5 and fr.verify = 1 and DATE_FORMAT(sysdate(),'%Y-%m-%d') = DATE_FORMAT(fr.create_time,'%Y-%m-%d') 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 sgu.group_id = #{groupId} and fr.verify = 1 and DATE_FORMAT(sysdate(),'%Y-%m-%d') = DATE_FORMAT(fr.create_time,'%Y-%m-%d') </select> <select id="queryFaceUserByJobNum" resultType="com.thhy.staff.modules.biz.platuser.entity.PlatUserFace"> @@ -966,4 +964,34 @@ </trim> </insert> + <select id="queryGroups" resultType="hashmap"> + select id,group_id as groupId,group_name as groupName from t_audio_group + </select> + + <select id="queryHelmetWarn" resultType="hashmap"> + select hr.device_id as deviceId,hr.sos_type,hr.user_name as userName,'' as position,hr.sm_time + from t_helmet_report hr + order by hr.sm_time + limit 10 + </select> + + <select id="queryAreaInfo" resultType="com.thhy.staff.modules.biz.platuser.entity.AreaAdmin"> + select reg.id as areaId,reg.region as areaName + from t_region_hazard_inform reg + </select> + + <select id="queryAdminByArea" resultType="com.thhy.staff.modules.biz.platuser.entity.NamePhoneDepart"> + select rwu.user_id,spu.real_name as realName,spu.phone,spu.photo,sd.depart_name as departName + from t_region_warranty_user rwu + left join sys_plat_user spu on spu.user_id = rwu.user_id + left join sys_depart_user sdu on sdu.user_id = spu.user_id + left join sys_depart sd on sd.depart_id = sdu.depart_id + where rwu.region_warranty_id = #{regionWarrantyId} + order by rwu.user_type + </select> + + <select id="faceArea" resultType="string"> + select DISTINCT area_name as areaName from t_face_device where area_name is not null + </select> + </mapper> -- Gitblit v1.9.3