整理代码

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

@@ -18,9 +18,13 @@ import com.mortals.xhx.module.holiday.model.HolidayQuery;
 import com.mortals.xhx.module.holiday.service.HolidayService;
 import com.mortals.xhx.module.perform.model.PerformAttendRecordEntity;
 import com.mortals.xhx.module.perform.model.PerformAttendRecordQuery;
+import com.mortals.xhx.module.perform.model.PerformErrorMessageEntity;
+import com.mortals.xhx.module.perform.model.PerformErrorMessageQuery;
 import com.mortals.xhx.module.perform.service.PerformAttendRecordService;
+import com.mortals.xhx.module.perform.service.PerformErrorMessageService;
 import com.mortals.xhx.utils.SpringUtils;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
@@ -52,6 +56,8 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
 
     private CheckAttendRecordService checkAttendRecordService;
 
+    private PerformErrorMessageService performErrorMessageService;
+
     public FixWorkOtherAttendance(int type) {
         super(type);
         this.attendanceGroupFixedworkService = SpringUtils.getBean(AttendanceGroupFixedworkService.class);
@@ -59,6 +65,7 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
         this.attendanceLeaveRecordService = SpringUtils.getBean(AttendanceLeaveRecordService.class);
         this.performAttendRecordService = SpringUtils.getBean(PerformAttendRecordService.class);
         this.checkAttendRecordService = SpringUtils.getBean(CheckAttendRecordService.class);
+        this.performErrorMessageService = SpringUtils.getBean(PerformErrorMessageService.class);
 
     }
 
@@ -448,7 +455,7 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
         //删除当前员工当日未处理的异常后，重新添加 处理的 不做删除
         //deleteErrorRecord(dateStr, attendanceRecordEntity.getStaffId(), context);
         //todo 级联删除优化
-         deleteErrorRecordCache(attendanceRecordEntity.getStaffId(), context);
+        deleteErrorRecordCache(attendanceRecordEntity.getStaffId(), context);
         if (!ObjectUtils.isEmpty(errorEntityList)) {
             //过滤异常列表中存在相同的记录
             errorEntityList = errorEntityList.stream().distinct().collect(Collectors.toList());
@@ -490,7 +497,8 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
             stopWatch.start("删除异常记录耗时");
             //todo 耗时长，删除优化
             //errorService
-
+            errorService.getDao().delete(errorIds);
+/*
             //线程池去删除异常记录
             Runnable runnable = new Runnable() {
                 @Override
@@ -498,7 +506,53 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
                     errorService.remove(errorIds, context);
                 }
             };
-            ThreadPool.getInstance().execute(runnable);
+            ThreadPool.getInstance().execute(runnable);*/
+
+            PerformAttendRecordQuery query = new PerformAttendRecordQuery();
+            query.setStaffId(staffId);
+            query.setErrorTimeStart(DateUtil.formatDate(delErrorList.get(0).getErrorDateTime()));
+            query.setErrorTimeEnd(DateUtil.formatDate(delErrorList.get(0).getErrorDateTime()));
+            query.setRuleIdNotList(Arrays.asList(9L));
+            List<PerformAttendRecordEntity> attendRecords = performAttendRecordService.find(query, context);
+
+            List<PerformAttendRecordEntity> delAttendRecords = attendRecords.stream().map(item -> {
+                Date errorTime = item.getErrorTime();
+                for (AttendanceRecordErrorEntity attendRecord : delErrorList) {
+                    if (errorTime.getTime() == attendRecord.getErrorDateTime().getTime()) {
+                        return item;
+                    }
+                }
+                return null;
+            }).filter(f -> f != null).collect(Collectors.toList());
+
+            if (!ObjectUtils.isEmpty(delAttendRecords)) {
+                Long[] delIds = delAttendRecords.stream().map(i -> i.getId()).toArray(Long[]::new);
+                performAttendRecordService.getDao().delete(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.getDao().delete(checkIds);
+                    //  checkAttendRecordService.remove(checkIds, context);
+                    //  log.info("删除考勤核查记录成功,size:{}",checkIds.length);
+
+                    PerformErrorMessageQuery performErrorMessageQuery = new PerformErrorMessageQuery();
+                    performErrorMessageQuery.setPerformType(PerformTypeEnum.考勤绩效.getValue());
+                    performErrorMessageQuery.setCheckRecordIdList(Arrays.asList(checkIds));
+                    List<PerformErrorMessageEntity> errorList = performErrorMessageService.find(performErrorMessageQuery);
+                    if (CollectionUtils.isNotEmpty(errorList)) {
+                        Long[] deleteIds = errorList.stream().map(i -> i.getId()).toArray(Long[]::new);
+                        performErrorMessageService.remove(deleteIds, context);
+                    }
+
+
+                }
+
+
+            }
+
 
             // errorService.getDao().delete(errorIds);
 /*