修正异常记录有重复的记录

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

@@ -80,6 +80,7 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
     public void doHandleWork(CommonData commonData) {
         AttendanceGroupFixedworkEntity attendanceGroupFixedworkEntity = attendanceGroupFixedworkService.selectOne(new AttendanceGroupFixedworkQuery()
                 .groupId(commonData.getAttendanceGroupEntity().getId()));
+        Map<Long, AttendanceClassEntity> classEntityMap = commonData.getClassEntityMap();
         if (ObjectUtils.isEmpty(attendanceGroupFixedworkEntity)) {
             log.info("attendanceGroupFixedworkEntity is null ! groupId:{}", commonData.getAttendanceGroupEntity().getId());
             return;
@@ -215,7 +216,8 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
         }
 
         //获取班次信息
-        AttendanceClassEntity attendanceClassEntity = attendanceClassService.get(weekClassId);
+     //   AttendanceClassEntity attendanceClassEntity = attendanceClassService.get(weekClassId);
+        AttendanceClassEntity attendanceClassEntity = classEntityMap.get(weekClassId);
         if (ObjectUtils.isEmpty(attendanceClassEntity)) {
             log.info("attendanceClassEntity is null ,weekClassId:{}", weekClassId);
             return;
@@ -340,7 +342,8 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
         //todo 判断当日当前人员是否存在请假，有请假则重新计算考勤  并根据时间段 更新详细记录中的请假状态
         if (isLeave) {
             //查看请假时间段，是否为跨天记录
-            AttendanceLeaveRecordEntity leaveRecord = leaveRecords.get(0);
+            for (AttendanceLeaveRecordEntity leaveRecord : leaveRecords) {
+          //  AttendanceLeaveRecordEntity leaveRecord = leaveRecords.get(0);
             long between = DateUtil.between(leaveRecord.getStartTime(), leaveRecord.getEndTime(), DateUnit.DAY);
             if (between > 0) {
                 //跨天 判断当前日期是否在全天，没在 就
@@ -359,6 +362,9 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
             } else {
                 //错误
             }
+
+            }
+
         }
 
         //生成异常记录
@@ -396,7 +402,6 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
                         detail.setGoWorkResult(GoWorkResultEnum.请假.getValue());
                     }
                 }
-
             }
 
             if (GoWorkResultEnum.请假.getValue() < offWorkResult) {