|
@@ -240,9 +240,16 @@ public class AttendanceSheetServiceImpl implements AttendanceSheetService {
|
|
|
LocalTime normalTimePm = LocalTime.parse(afternoonTime, formatter);
|
|
|
LocalTime finishAmFlag = LocalTime.parse(morningFinishTime, formatter);
|
|
|
LocalTime finishPmFlag = LocalTime.parse(afternoonFinishTime, formatter);
|
|
|
+ // 创建一个HashSet实例,用于存储忽略用户
|
|
|
+ Set<String> userIgnoreSet = new HashSet<>();
|
|
|
+ userIgnoreSet.add("管理员");
|
|
|
+ userIgnoreSet.add("测试人员");
|
|
|
List<AdminUserRespDTO> userList = userApi.getUserList().getCheckedData();
|
|
|
Map<String, List<AttendanceRecordDO>> usernameAttendanceRecordMap = attendanceRecordDOList.stream().collect(Collectors.groupingBy(AttendanceRecordDO::getUsername));
|
|
|
userList.forEach(adminUserRespDTO -> {
|
|
|
+ if(userIgnoreSet.contains(adminUserRespDTO.getNickname())){
|
|
|
+ return;
|
|
|
+ }
|
|
|
List<AttendanceRecordDO> recordList = usernameAttendanceRecordMap.get(adminUserRespDTO.getUsername());
|
|
|
AttendanceSheetDO morningSheetDO;
|
|
|
AttendanceSheetDO afternoonSheetDO;
|