From 86aa3849a6f37bac56f93cf141e8e46b0bea9b8a Mon Sep 17 00:00:00 2001 From: aikai Date: Wed, 26 Jun 2024 19:48:08 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/service/attendance/AttendanceServiceImpl.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/attendance/AttendanceServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/attendance/AttendanceServiceImpl.java index 23f81eea..3dcaf794 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/attendance/AttendanceServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/attendance/AttendanceServiceImpl.java @@ -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> map = list.stream().collect(Collectors.groupingBy(AttendancePunchRecordDO::getDayTime)); + Map> map = list.stream().collect(Collectors.groupingBy(AttendancePunchRecordDO::getDayTime, TreeMap::new, Collectors.toList())); List averageWorkingHours = new ArrayList<>(); List attendanceDays = new ArrayList<>(); List beLateNumber = new ArrayList<>(); @@ -811,8 +812,6 @@ public class AttendanceServiceImpl implements AttendanceService { .in(AttendancePunchRecordDO::getUserId, userList) .in(AttendancePunchRecordDO::getDayTime, dateList)); // -- 根据部门分组 - 根据考勤组分组 - - }