优化考勤计算

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceRecordHikServiceImpl.java

@@ -147,10 +147,10 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte
         Map<Long, AttendanceClassDetailEntity> classDetailEntityMap = attendanceClassDetailService.find(new AttendanceClassDetailQuery()).parallelStream().collect(Collectors.toMap(x -> x.getId(), y -> y, (o, n) -> n));
         Map<Long, List<AttendanceGroupFixedworkSpecialEntity>> fixedSpecialGroupMap = specialService.find(new AttendanceGroupFixedworkSpecialEntity()).parallelStream().collect(Collectors.groupingBy(x -> x.getFixedWorkId()));
 
-        AttendanceLeaveRecordQuery leaveRecordQuery = new AttendanceLeaveRecordQuery();
+  /*      AttendanceLeaveRecordQuery leaveRecordQuery = new AttendanceLeaveRecordQuery();
         leaveRecordQuery.setAuditResultList(Arrays.asList(1, 4));
         Map<Long, List<AttendanceLeaveRecordEntity>> leaveRecordGroupMap = attendanceLeaveRecordService.find(leaveRecordQuery).parallelStream().collect(Collectors.groupingBy(x -> x.getLeavePersonId()));
-
+*/
 
         for (Map.Entry<Long, List<AttendanceRecordHikEntity>> itemEntry : listMap.entrySet()) {
             //按人员
@@ -180,7 +180,7 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte
 
                 StaffEntity staffEntity = staffService.getExtCache(staffId.toString());
                 if (ObjectUtils.isEmpty(staffEntity)) {
-                    log.info("staffEntity is null ,staffId:{}", staffId);
+                    //log.info("staffEntity is null ,staffId:{}", staffId);
                     continue;
                 }
 
@@ -214,7 +214,7 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte
                     commonData.setRecordHikEntities(recordHikEntities);
                     commonData.setFixedSpecialGroupMap(fixedSpecialGroupMap);
                     commonData.setClassDetailEntityMap(classDetailEntityMap);
-                    commonData.setLeaveRecordGroupMap(leaveRecordGroupMap);
+                   // commonData.setLeaveRecordGroupMap(leaveRecordGroupMap);
                     workAbstract.doHandleWork(commonData);
                 }
 
@@ -244,7 +244,7 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte
                         commonData.setRecordHikEntities(recordHikEntities);
                         commonData.setFixedSpecialGroupMap(fixedSpecialGroupMap);
                         commonData.setClassDetailEntityMap(classDetailEntityMap);
-                        commonData.setLeaveRecordGroupMap(leaveRecordGroupMap);
+                       // commonData.setLeaveRecordGroupMap(leaveRecordGroupMap);
                         workAbstract.doHandleWork(commonData);
                     }
                 }

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceStatServiceImpl.java

@@ -358,7 +358,7 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc
                     attendanceStaffStatService.update(updateStaffStat);
                 }
             }
-            log.info("完成汇总当前日期假期余额.....");
+            //log.info("完成汇总当前日期假期余额.....");
 
             //汇总当前日期异常考勤
             List<ErrorSummaryVo> errorSummaryVoList = attendanceSummaryDao.getErrorSummary(query);

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/work/CommonData.java

@@ -40,7 +40,7 @@ public class CommonData {
 
     private  Map<Long, List<AttendanceGroupFixedworkSpecialEntity>> fixedSpecialGroupMap;
 
-    private Map<Long, List<AttendanceLeaveRecordEntity>> leaveRecordGroupMap;
+   // private Map<Long, List<AttendanceLeaveRecordEntity>> leaveRecordGroupMap;
 
 
 }

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/work/FixWorkOtherAttendance.java

@@ -86,7 +86,7 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
         Map<Long, List<AttendanceGroupFixedworkSpecialEntity>> fixedSpecialGroupMap = commonData.getFixedSpecialGroupMap();
         this.classDetailEntityMap = commonData.getClassDetailEntityMap();
 
-        Map<Long, List<AttendanceLeaveRecordEntity>> leaveRecordGroupMap = commonData.getLeaveRecordGroupMap();
+       // Map<Long, List<AttendanceLeaveRecordEntity>> leaveRecordGroupMap = commonData.getLeaveRecordGroupMap();
 
         if (ObjectUtils.isEmpty(attendanceGroupFixedworkEntity)) {
             log.info("attendanceGroupFixedworkEntity is null ! groupId:{}", commonData.getAttendanceGroupEntity().getId());
@@ -122,8 +122,8 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
         leaveRecordQuery.setLeavePersonId(commonData.getStaffId());
         leaveRecordQuery.setAuditResultList(Arrays.asList(1, 4));
         boolean isLeave = false;
-       // List<AttendanceLeaveRecordEntity> leaveRecordEntities = attendanceLeaveRecordService.find(leaveRecordQuery);
-        List<AttendanceLeaveRecordEntity> leaveRecordEntities = leaveRecordGroupMap.get(commonData.getStaffId());
+        List<AttendanceLeaveRecordEntity> leaveRecordEntities = attendanceLeaveRecordService.find(leaveRecordQuery);
+        //List<AttendanceLeaveRecordEntity> leaveRecordEntities = leaveRecordGroupMap.get(commonData.getStaffId());
 
         List<AttendanceLeaveRecordEntity> leaveRecords = null;
         if (!ObjectUtils.isEmpty(leaveRecordEntities)) {

attendance-performance-manager/src/test/java/com/mortals/httpclient/system.http

@@ -47,8 +47,7 @@ Content-Type: application/json
 
 {
   "attendanceDateStart": "2024-07-01",
-  "attendanceDateEnd": "2024-07-19",
-  "staffId": 346
+  "attendanceDateEnd": "2024-07-30"
 }