|
@@ -2,10 +2,7 @@ package com.ruoyi.system.service.impl;
|
|
|
|
|
|
|
|
import java.sql.SQLException;
|
|
import java.sql.SQLException;
|
|
|
import java.sql.SQLIntegrityConstraintViolationException;
|
|
import java.sql.SQLIntegrityConstraintViolationException;
|
|
|
-import java.time.Duration;
|
|
|
|
|
-import java.time.LocalDate;
|
|
|
|
|
-import java.time.LocalDateTime;
|
|
|
|
|
-import java.time.ZoneId;
|
|
|
|
|
|
|
+import java.time.*;
|
|
|
import java.time.format.DateTimeFormatter;
|
|
import java.time.format.DateTimeFormatter;
|
|
|
import java.util.*;
|
|
import java.util.*;
|
|
|
import java.util.stream.Collectors;
|
|
import java.util.stream.Collectors;
|
|
@@ -826,7 +823,7 @@ public class SysUserServiceImpl implements ISysUserService
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
|
- public Object selectUserClock() {
|
|
|
|
|
|
|
+ public List<UserRecordOut> selectUserClock() {
|
|
|
Long userId=SecurityUtils.getUserId();
|
|
Long userId=SecurityUtils.getUserId();
|
|
|
return userRecordMapper.selectUserClock(userId);
|
|
return userRecordMapper.selectUserClock(userId);
|
|
|
}
|
|
}
|
|
@@ -877,11 +874,14 @@ public class SysUserServiceImpl implements ISysUserService
|
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
|
- public Object UserClockDetails(Long id) {
|
|
|
|
|
|
|
+ public UserRecordOut UserClockDetails(Long id) {
|
|
|
UserRecord userRecord = userRecordMapper.selectByPrimaryKey(id);
|
|
UserRecord userRecord = userRecordMapper.selectByPrimaryKey(id);
|
|
|
UserRecordOut out=new UserRecordOut();
|
|
UserRecordOut out=new UserRecordOut();
|
|
|
BeanUtils.copyProperties(userRecord, out);
|
|
BeanUtils.copyProperties(userRecord, out);
|
|
|
- return null;
|
|
|
|
|
|
|
+ LocalDate localDate =userRecord.getRecordTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
|
|
|
|
|
+ List<ProjectStaffRecord> projectStaffRecords = projectStaffRecordMapper.selectByDDUidAndTime(out.getDdUserId(), localDate);
|
|
|
|
|
+ out.setList(projectStaffRecords);
|
|
|
|
|
+ return out;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
}
|
|
}
|