From d772015e06b58af9f0cc9e9f58867f123a857412 Mon Sep 17 00:00:00 2001
From: bingbo <bingbo1993@126.com>
Date: 星期一, 27 十一月 2023 13:23:34 +0800
Subject: [PATCH] 加减钢筋笼库存 带记录
---
hd/pipe/StaffManage/src/main/java/com/thhy/staff/modules/biz/platuser/service/impl/PlatUserServiceImpl.java | 11 +++++++----
hd/pipe/StaffManage/src/main/java/com/thhy/staff/modules/biz/platuser/entity/DoorUserVo.java | 5 ++++-
hd/pipe/StaffManage/src/main/resources/mapping/PlatUserMapper.xml | 12 +++++-------
3 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/hd/pipe/StaffManage/src/main/java/com/thhy/staff/modules/biz/platuser/entity/DoorUserVo.java b/hd/pipe/StaffManage/src/main/java/com/thhy/staff/modules/biz/platuser/entity/DoorUserVo.java
index 529288b..ba00bfb 100644
--- a/hd/pipe/StaffManage/src/main/java/com/thhy/staff/modules/biz/platuser/entity/DoorUserVo.java
+++ b/hd/pipe/StaffManage/src/main/java/com/thhy/staff/modules/biz/platuser/entity/DoorUserVo.java
@@ -3,11 +3,12 @@
import lombok.Data;
import java.io.Serializable;
+import java.util.Date;
@Data
public class DoorUserVo implements Serializable {
- private String createTime;
+ private Date createTime;
private String realName;
@@ -18,4 +19,6 @@
private String jobNum;
private String id;
+
+ private String photo;
}
diff --git a/hd/pipe/StaffManage/src/main/java/com/thhy/staff/modules/biz/platuser/service/impl/PlatUserServiceImpl.java b/hd/pipe/StaffManage/src/main/java/com/thhy/staff/modules/biz/platuser/service/impl/PlatUserServiceImpl.java
index c9fbf76..590c363 100644
--- a/hd/pipe/StaffManage/src/main/java/com/thhy/staff/modules/biz/platuser/service/impl/PlatUserServiceImpl.java
+++ b/hd/pipe/StaffManage/src/main/java/com/thhy/staff/modules/biz/platuser/service/impl/PlatUserServiceImpl.java
@@ -25,6 +25,7 @@
import com.thhy.staff.utils.ProcessFlag;
import com.thhy.staff.utils.StaffNoUtils;
import io.netty.channel.ChannelHandlerContext;
+import net.bytebuddy.build.Plugin;
import org.checkerframework.checker.units.qual.A;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -34,6 +35,7 @@
import java.io.Serializable;
import java.math.BigDecimal;
import java.math.RoundingMode;
+import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.CopyOnWriteArraySet;
@@ -530,13 +532,14 @@
int userCount = platUserMapper.queryPlatUser(userInfo.getCompanyId());
Map<String, Object> map = new HashMap<>();
map.put("mod","facerecord");
- map.put("totalUserCount",userCount);
- map.put("watchUserCount",0);
- map.put("dangerUserCount",0);
+ //map.put("totalUserCount",userCount);
+ //map.put("watchUserCount",0);
+ //map.put("dangerUserCount",0);
List<DoorUserVo> list = platUserMapper.queryDoorUser();
map.put("doorUserList",list);
PlatUserFace platUserFace = platUserMapper.queryFaceUserByJobNum(list.get(0).getJobNum());
- platUserFace.setPassTime(list.get(0).getCreateTime());
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ platUserFace.setPassTime(sdf.format(list.get(0).getCreateTime()));
platUserFace.setRecordId(list.get(0).getId());
map.put("firstUserInfo",platUserFace);
return map;
diff --git a/hd/pipe/StaffManage/src/main/resources/mapping/PlatUserMapper.xml b/hd/pipe/StaffManage/src/main/resources/mapping/PlatUserMapper.xml
index 70a6c79..7ddea16 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,11 +875,8 @@
</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">
@@ -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">
--
Gitblit v1.9.3