|
|
@@ -785,7 +785,6 @@ public class SysUserServiceImpl implements ISysUserService
|
|
|
for (UserClockDtails e:list){
|
|
|
Long ddUserId = Long.valueOf(e.getUserId());
|
|
|
List<ProjectStaffRecord> projectStaffRecords = projectStaffRecordMapper.selectByDDUidAndTime(ddUserId, e.getClockTime());
|
|
|
- if (!projectStaffRecords.isEmpty()){
|
|
|
UserRecordOut ur=new UserRecordOut();
|
|
|
ur.setName(e.getName());
|
|
|
ur.setDdUserId(Long.valueOf(e.getUserId()));
|
|
|
@@ -800,7 +799,9 @@ public class SysUserServiceImpl implements ISysUserService
|
|
|
ur.setStatus(1);
|
|
|
}
|
|
|
ur.setRecordTime(Date.from(e.getClockTime().atStartOfDay().atZone(ZoneId.systemDefault()).toInstant()));
|
|
|
- if (projectStaffRecords.size()==1){
|
|
|
+ if (projectStaffRecords.isEmpty()){
|
|
|
+ ur.setStatus(4);
|
|
|
+ }else if (projectStaffRecords.size()==1){
|
|
|
ur.setStatus(0);
|
|
|
ur.setPsrId(projectStaffRecords.get(0).getId());
|
|
|
}else if (projectStaffRecords.size()>1){
|
|
|
@@ -813,7 +814,6 @@ public class SysUserServiceImpl implements ISysUserService
|
|
|
}
|
|
|
ur.setCreateId(SecurityUtils.getUserId());
|
|
|
userRecordList.add(ur);
|
|
|
- }
|
|
|
}
|
|
|
if (!userRecordList.isEmpty()){
|
|
|
for (UserRecordOut userRecordOut : userRecordList) {
|
|
|
@@ -823,9 +823,9 @@ public class SysUserServiceImpl implements ISysUserService
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public List<UserRecordOut> selectUserClock() {
|
|
|
+ public List<UserRecordOut> selectUserClock(Integer status) {
|
|
|
Long userId=SecurityUtils.getUserId();
|
|
|
- return userRecordMapper.selectUserClock(userId);
|
|
|
+ return userRecordMapper.selectUserClock(userId,status);
|
|
|
}
|
|
|
|
|
|
|