ak/zn-cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

统计排序

Browse Source
This commit is contained in:
aikai 2024-06-26 19:48:08 +08:00
parent 2c02ee738d
commit 86aa3849a6
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/attendance/AttendanceServiceImpl.java
View File

@ -486,10 +486,11 @@ public class AttendanceServiceImpl implements AttendanceService {
.eq(AttendancePunchRecordDO::getUserId, dto.getUserId())
.in(AttendancePunchRecordDO::getDayTime, dateList)
.eq(AttendancePunchRecordDO::getNextDayFlag, Constants.FALSE)
.orderByAsc(AttendancePunchRecordDO::getCreateTime)
.orderByAsc(AttendancePunchRecordDO::getWorkType)
.orderByAsc(AttendancePunchRecordDO::getLevel));
// ---
Map<String, List<AttendancePunchRecordDO>> map = list.stream().collect(Collectors.groupingBy(AttendancePunchRecordDO::getDayTime));
Map<String, List<AttendancePunchRecordDO>> map = list.stream().collect(Collectors.groupingBy(AttendancePunchRecordDO::getDayTime, TreeMap::new, Collectors.toList()));
List<AttendancePunchStatisticsVO> averageWorkingHours = new ArrayList<>();
List<AttendancePunchStatisticsVO> attendanceDays = new ArrayList<>();
List<AttendancePunchStatisticsVO> beLateNumber = new ArrayList<>();
@ -811,8 +812,6 @@ public class AttendanceServiceImpl implements AttendanceService {
.in(AttendancePunchRecordDO::getUserId, userList)
.in(AttendancePunchRecordDO::getDayTime, dateList));
// -- 根据部门分组 - 根据考勤组分组
}