diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceRecordErrorServiceImpl.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceRecordErrorServiceImpl.java index dc741a1e48a7e8af0801c093f598a563ef98474f..3a024f396e7a856efe06455976d851d36c6f0c8b 100644 --- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceRecordErrorServiceImpl.java +++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceRecordErrorServiceImpl.java @@ -25,7 +25,10 @@ import com.mortals.xhx.module.check.model.vo.StaffCheckSummaryQuery; import com.mortals.xhx.module.check.service.CheckAttendRecordService; import com.mortals.xhx.module.perform.model.PerformAttendRecordEntity; import com.mortals.xhx.module.perform.model.PerformAttendRecordQuery; +import com.mortals.xhx.module.perform.model.PerformRulesEntity; +import com.mortals.xhx.module.perform.model.PerformRulesQuery; import com.mortals.xhx.module.perform.service.PerformAttendRecordService; +import com.mortals.xhx.module.perform.service.PerformRulesService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -61,6 +64,8 @@ public class AttendanceRecordErrorServiceImpl extends AbstractCRUDServiceImpl<At private AttendanceLeaveRecordService attendanceLeaveRecordService; @Autowired private CheckAttendRecordService checkAttendRecordService; + @Autowired + private PerformRulesService performRulesService; @Override @@ -249,12 +254,15 @@ public class AttendanceRecordErrorServiceImpl extends AbstractCRUDServiceImpl<At PerformAttendRecordQuery query = new PerformAttendRecordQuery(); query.setStaffIdList(staffIdList); query.setRuleIdNotList(Arrays.asList(9L));*/ - + PerformRulesQuery performRulesQuery = new PerformRulesQuery(); + performRulesQuery.setRuleCodeList(Arrays.asList("ATTEND1009","ATTEND1010","ATTEND1011","ATTEND1101","ATTEND1102")); //浜斾釜璇峰亣鎵e垎瑙勫垯,浜嬪亣锛岀梾鍋� + List<PerformRulesEntity> performRulesList = performRulesService.find(performRulesQuery); + List<Long> ruleIdList = performRulesList.stream().map(PerformRulesEntity::getId).collect(Collectors.toList()); for (AttendanceRecordErrorEntity attendanceRecordErrorEntity : delErrorList) { PerformAttendRecordQuery query = new PerformAttendRecordQuery(); query.setStaffId(attendanceRecordErrorEntity.getStaffId()); query.setErrorTime(attendanceRecordErrorEntity.getErrorDateTime()); - query.setRuleIdNotList(Arrays.asList(9L,126L,127L)); //涓変釜浜嬪亣鎵e垎瑙勫垯id + query.setRuleIdNotList(ruleIdList); //浜斾釜璇峰亣鎵e垎瑙勫垯id List<PerformAttendRecordEntity> delAttendRecords = performAttendRecordService.find(query, context); if (!ObjectUtils.isEmpty(delAttendRecords)) { Long[] delIds = delAttendRecords.stream().map(i -> i.getId()).toArray(Long[]::new);