Commit 0ae0e771 authored by 赵啸非's avatar 赵啸非

恢复级联删除考勤异常与考勤绩效

parent 7695c7fe
...@@ -455,17 +455,17 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract { ...@@ -455,17 +455,17 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
} }
} }
//删除当前员工当日未处理的异常后,重新添加 处理的 不做删除 //删除当前员工当日未处理的异常后,重新添加 处理的 不做删除
//deleteErrorRecord(dateStr, attendanceRecordEntity.getStaffId(), context); deleteErrorRecord(dateStr, attendanceRecordEntity.getStaffId(), context);
//todo 级联删除优化 耗时50秒 //todo 级联删除优化 耗时50秒
deleteErrorRecordCache(attendanceRecordEntity.getStaffId(), context); //deleteErrorRecordCache(attendanceRecordEntity.getStaffId(), context);
if (!ObjectUtils.isEmpty(errorEntityList)) { if (!ObjectUtils.isEmpty(errorEntityList)) {
//过滤异常列表中存在相同的记录 //过滤异常列表中存在相同的记录
errorEntityList = errorEntityList.stream().distinct().collect(Collectors.toList()); errorEntityList = errorEntityList.stream().distinct().collect(Collectors.toList());
for (AttendanceRecordErrorEntity errorEntity : errorEntityList) { for (AttendanceRecordErrorEntity errorEntity : errorEntityList) {
//查看是否存在相同的异常记录,如果存在 则不添加 todo 非数据库查询方式判断优化 //查看是否存在相同的异常记录,如果存在 则不添加 todo 非数据库查询方式判断优化
List<AttendanceRecordErrorEntity> attendanceRecordErrorEntities = commonData.getErrorGroupStaffMap().getOrDefault(attendanceRecordEntity.getStaffId(), new ArrayList<>(0)); List<AttendanceRecordErrorEntity> attendanceRecordErrorEntities = commonData.getErrorGroupStaffMap().getOrDefault(attendanceRecordEntity.getStaffId(), new ArrayList<>(0));
checkAndSaveCache(context, attendanceRecordErrorEntities, errorEntity); // checkAndSaveCache(context, attendanceRecordErrorEntities, errorEntity);
// checkAndSave(context, errorEntity); checkAndSave(context, errorEntity);
} }
} }
} }
...@@ -495,8 +495,8 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract { ...@@ -495,8 +495,8 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
Long[] errorIds = delErrorList.stream().map(i -> i.getId()).toArray(Long[]::new); Long[] errorIds = delErrorList.stream().map(i -> i.getId()).toArray(Long[]::new);
if (!ObjectUtils.isEmpty(errorIds)) { if (!ObjectUtils.isEmpty(errorIds)) {
//log.info("删除 {} 人员:{} 异常记录:{}",dateStr,staffId, JSON.toJSONString(attendanceRecordErrorEntities)); //log.info("删除 {} 人员:{} 异常记录:{}",dateStr,staffId, JSON.toJSONString(attendanceRecordErrorEntities));
// StopWatch stopWatch = new StopWatch(); // StopWatch stopWatch = new StopWatch();
// stopWatch.start("删除异常记录耗时"); // stopWatch.start("删除异常记录耗时");
//todo 耗时长,删除优化 //todo 耗时长,删除优化
errorService.getDao().delete(errorIds); errorService.getDao().delete(errorIds);
/* /*
...@@ -549,8 +549,8 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract { ...@@ -549,8 +549,8 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
} }
} }
} }
// stopWatch.stop(); // stopWatch.stop();
// log.info("删除异常记录耗时:{}ms", stopWatch.getLastTaskTimeMillis()); // log.info("删除异常记录耗时:{}ms", stopWatch.getLastTaskTimeMillis());
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment