修改导出动态列

attendance-performance-manager/src/main/java/com/mortals/xhx/base/login/web/LoginController.java

@@ -201,23 +201,29 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
         long beLate = attendanceRecordEntities.parallelStream()
                 .flatMap(item -> item.getAttendanceRecordDetailList().stream())
                 .filter(f -> GoWorkResultEnum.迟到.getValue() == f.getGoWorkResult() || OffWorkResultEnum.迟到.getValue() == f.getOffWorkResult())
+                .map(i->i.getStaffId())
+                .distinct()
                 .count();
 
         //早退次数
         long leaveEarly = attendanceRecordEntities.parallelStream()
                 .flatMap(item -> item.getAttendanceRecordDetailList().stream())
                 .filter(f -> GoWorkResultEnum.早退.getValue() == f.getGoWorkResult() || OffWorkResultEnum.早退.getValue() == f.getOffWorkResult())
+                .map(i->i.getStaffId())
+                .distinct()
                 .count();
 
         //缺卡次数
         long lackOfCards = attendanceRecordEntities.parallelStream()
                 .flatMap(item -> item.getAttendanceRecordDetailList().stream())
                 .filter(f -> GoWorkResultEnum.缺卡.getValue() == f.getGoWorkResult() || OffWorkResultEnum.缺卡.getValue() == f.getOffWorkResult())
+                .map(i->i.getStaffId())
+                .distinct()
                 .count();
 
 
         AttendanceVacationRecordQuery vacationRecordQuery = new AttendanceVacationRecordQuery();
-        vacationRecordQuery.setCreateTimeStart(DateUtil.today());
+        vacationRecordQuery.setCreateTimeStart(DateUtil.beginOfMonth(new Date()).toDateStr());
         vacationRecordQuery.setCreateTimeEnd(DateUtil.today());
         int levealPersonNum = vacationRecordService.count(vacationRecordQuery, getContext());