整理代码

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

@@ -453,9 +453,9 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
             }
         }
         //删除当前员工当日未处理的异常后，重新添加 处理的 不做删除
-        //deleteErrorRecord(dateStr, attendanceRecordEntity.getStaffId(), context);
-        //todo 级联删除优化
-        deleteErrorRecordCache(attendanceRecordEntity.getStaffId(), context);
+        deleteErrorRecord(dateStr, attendanceRecordEntity.getStaffId(), context);
+        //todo 级联删除优化 耗时50秒
+        //deleteErrorRecordCache(attendanceRecordEntity.getStaffId(), context);
         if (!ObjectUtils.isEmpty(errorEntityList)) {
             //过滤异常列表中存在相同的记录
             errorEntityList = errorEntityList.stream().distinct().collect(Collectors.toList());
@@ -496,7 +496,6 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
             StopWatch stopWatch = new StopWatch();
             stopWatch.start("删除异常记录耗时");
             //todo 耗时长，删除优化
-            //errorService
             errorService.getDao().delete(errorIds);
 /*
             //线程池去删除异常记录
@@ -546,56 +545,8 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
                         Long[] deleteIds = errorList.stream().map(i -> i.getId()).toArray(Long[]::new);
                         performErrorMessageService.remove(deleteIds, context);
                     }
-
-
-                }
-
-
                 }
-
-
-            // errorService.getDao().delete(errorIds);
-/*
-
-
-
-
-            for (AttendanceRecordErrorEntity attendanceRecordErrorEntity : delErrorList) {
-                PerformAttendRecordQuery query = new PerformAttendRecordQuery();
-                query.setStaffId(attendanceRecordErrorEntity.getStaffId());
-                query.setErrorTime(attendanceRecordErrorEntity.getErrorDateTime());
-                query.setRuleIdNotList(Arrays.asList(9L));
-                List<PerformAttendRecordEntity> delAttendRecords = performAttendRecordService.find(query, context);
-                if (!ObjectUtils.isEmpty(delAttendRecords)) {
-                    Long[] delIds = delAttendRecords.stream().map(i -> i.getId()).toArray(Long[]::new);
-                    performAttendRecordService.remove(delIds, context);
             }
-            }
-*/
-
-
-       /*     PerformAttendRecordQuery query = new PerformAttendRecordQuery();
-            query.setIdList(Arrays.asList(ids));
-            List<PerformAttendRecordEntity> performAttendRecordEntities = this.find(query, context);
-
-            if (!ObjectUtils.isEmpty(performAttendRecordEntities)) {
-                Long[] delIds = performAttendRecordEntities.stream().map(i -> i.getId()).toArray(Long[]::new);
-                if (!ObjectUtils.isEmpty(delIds)) {
-                    CheckAttendRecordQuery checkAttendRecordQuery = new CheckAttendRecordQuery();
-                    checkAttendRecordQuery.setRecordIdList(Arrays.asList(delIds));
-                    List<CheckAttendRecordEntity> checkAttendRecordEntities = checkAttendRecordService.find(checkAttendRecordQuery, context);
-                    if (!ObjectUtils.isEmpty(checkAttendRecordEntities)) {
-                        Long[] checkIds = checkAttendRecordEntities.stream().map(i -> i.getId()).toArray(Long[]::new);
-                        checkAttendRecordService.remove(checkIds, context);
-                        //  log.info("删除考勤核查记录成功,size:{}",checkIds.length);
-                    }
-                }
-            }*/
-
-            //删除关联的绩效记录
-
-            //删除关联的考勤记录
-
             stopWatch.stop();
             log.info("删除异常记录耗时：{}ms", stopWatch.getLastTaskTimeMillis());
         }