Commit 107369c2 authored by 廖旭伟's avatar 廖旭伟

异常考勤记录删除前逻辑处理,排除事假病假等需要扣分的规则

parent e3866599
...@@ -25,7 +25,10 @@ import com.mortals.xhx.module.check.model.vo.StaffCheckSummaryQuery; ...@@ -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.check.service.CheckAttendRecordService;
import com.mortals.xhx.module.perform.model.PerformAttendRecordEntity; import com.mortals.xhx.module.perform.model.PerformAttendRecordEntity;
import com.mortals.xhx.module.perform.model.PerformAttendRecordQuery; 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.PerformAttendRecordService;
import com.mortals.xhx.module.perform.service.PerformRulesService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -61,6 +64,8 @@ public class AttendanceRecordErrorServiceImpl extends AbstractCRUDServiceImpl<At ...@@ -61,6 +64,8 @@ public class AttendanceRecordErrorServiceImpl extends AbstractCRUDServiceImpl<At
private AttendanceLeaveRecordService attendanceLeaveRecordService; private AttendanceLeaveRecordService attendanceLeaveRecordService;
@Autowired @Autowired
private CheckAttendRecordService checkAttendRecordService; private CheckAttendRecordService checkAttendRecordService;
@Autowired
private PerformRulesService performRulesService;
@Override @Override
...@@ -249,12 +254,15 @@ public class AttendanceRecordErrorServiceImpl extends AbstractCRUDServiceImpl<At ...@@ -249,12 +254,15 @@ public class AttendanceRecordErrorServiceImpl extends AbstractCRUDServiceImpl<At
PerformAttendRecordQuery query = new PerformAttendRecordQuery(); PerformAttendRecordQuery query = new PerformAttendRecordQuery();
query.setStaffIdList(staffIdList); query.setStaffIdList(staffIdList);
query.setRuleIdNotList(Arrays.asList(9L));*/ query.setRuleIdNotList(Arrays.asList(9L));*/
PerformRulesQuery performRulesQuery = new PerformRulesQuery();
performRulesQuery.setRuleCodeList(Arrays.asList("ATTEND1009","ATTEND1010","ATTEND1011","ATTEND1101","ATTEND1102")); //五个请假扣分规则,事假,病假
List<PerformRulesEntity> performRulesList = performRulesService.find(performRulesQuery);
List<Long> ruleIdList = performRulesList.stream().map(PerformRulesEntity::getId).collect(Collectors.toList());
for (AttendanceRecordErrorEntity attendanceRecordErrorEntity : delErrorList) { for (AttendanceRecordErrorEntity attendanceRecordErrorEntity : delErrorList) {
PerformAttendRecordQuery query = new PerformAttendRecordQuery(); PerformAttendRecordQuery query = new PerformAttendRecordQuery();
query.setStaffId(attendanceRecordErrorEntity.getStaffId()); query.setStaffId(attendanceRecordErrorEntity.getStaffId());
query.setErrorTime(attendanceRecordErrorEntity.getErrorDateTime()); query.setErrorTime(attendanceRecordErrorEntity.getErrorDateTime());
query.setRuleIdNotList(Arrays.asList(9L,126L,127L)); //三个事假扣分规则id query.setRuleIdNotList(ruleIdList); //五个请假扣分规则id
List<PerformAttendRecordEntity> delAttendRecords = performAttendRecordService.find(query, context); List<PerformAttendRecordEntity> delAttendRecords = performAttendRecordService.find(query, context);
if (!ObjectUtils.isEmpty(delAttendRecords)) { if (!ObjectUtils.isEmpty(delAttendRecords)) {
Long[] delIds = delAttendRecords.stream().map(i -> i.getId()).toArray(Long[]::new); Long[] delIds = delAttendRecords.stream().map(i -> i.getId()).toArray(Long[]::new);
......
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