Merge remote-tracking branch 'origin/master'

attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/web/StaffController.java

@@ -134,35 +134,57 @@ public class StaffController extends BaseCRUDJsonBodyMappingController<StaffServ
         attendanceRecordQuery.setWorkNum(entity.getWorkNum());
         List<AttendanceRecordEntity> attendanceRecordEntities = recordService.find(attendanceRecordQuery);
 
-
+        List<AttendanceRecordDetailEntity> allDetail = new ArrayList<>();
+        for (AttendanceRecordEntity recordEntity:attendanceRecordEntities){
+            allDetail.addAll(recordEntity.getAttendanceRecordDetailList());
+        }
         //迟到次数
-        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 beLate = 0l;
         //早退次数
-        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 leaveEarly = 0l;
         //缺卡次数
-        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();
+        long lackOfCards = 0l;
+        for(AttendanceRecordDetailEntity item:allDetail){
+            if(GoWorkResultEnum.迟到.getValue() == item.getGoWorkResult() || OffWorkResultEnum.迟到.getValue() == item.getOffWorkResult()){
+                beLate++;
+            }
+            if(GoWorkResultEnum.早退.getValue() == item.getGoWorkResult() || OffWorkResultEnum.早退.getValue() == item.getOffWorkResult()){
+                leaveEarly++;
+            }
+            if(GoWorkResultEnum.缺卡.getValue() == item.getGoWorkResult() || OffWorkResultEnum.缺卡.getValue() == item.getOffWorkResult()){
+                lackOfCards++;
+            }
+        }
+
+//        //迟到次数
+//        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();
 
 
         AttendanceLeaveRecordQuery leaveRecordQuery = new AttendanceLeaveRecordQuery();
-        leaveRecordQuery.setCreateTimeStart(DateUtil.beginOfMonth(new Date()).toDateStr());
-        leaveRecordQuery.setCreateTimeEnd(DateUtil.today());
+        //请假开始时间大于当前月份初始日期
+        leaveRecordQuery.setStartTimeStart(DateUtil.beginOfMonth(new Date()).toDateStr());
+        leaveRecordQuery.setStartTimeEnd(DateUtil.today());
         leaveRecordQuery.setLeavePersonId(entity.getId());
         leaveRecordQuery.setProcessStatus(ProcessStatusEnum.已处理.getValue());
         int levealPersonNum = leaveRecordService.count(leaveRecordQuery, getContext());