Commit c1214625 authored by 赵啸非's avatar 赵啸非

修改固定班次考勤

parent 4e54dd79
...@@ -4,12 +4,10 @@ import cn.hutool.core.date.DateUtil; ...@@ -4,12 +4,10 @@ import cn.hutool.core.date.DateUtil;
import com.mortals.framework.model.OrderCol; import com.mortals.framework.model.OrderCol;
import com.mortals.framework.util.DateUtils; import com.mortals.framework.util.DateUtils;
import com.mortals.xhx.common.code.GoWorkResultEnum; import com.mortals.xhx.common.code.GoWorkResultEnum;
import com.mortals.xhx.common.code.MustEnum;
import com.mortals.xhx.common.code.TypeEnum; import com.mortals.xhx.common.code.TypeEnum;
import com.mortals.xhx.module.attendance.model.*; import com.mortals.xhx.module.attendance.model.*;
import com.mortals.xhx.module.attendance.service.AttendanceClassService; import com.mortals.xhx.module.attendance.service.*;
import com.mortals.xhx.module.attendance.service.AttendanceGroupFreeworkService;
import com.mortals.xhx.module.attendance.service.AttendanceRecordHikService;
import com.mortals.xhx.module.attendance.service.AttendanceRecordService;
import com.mortals.xhx.utils.SpringUtils; import com.mortals.xhx.utils.SpringUtils;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -18,6 +16,8 @@ import org.springframework.util.ObjectUtils; ...@@ -18,6 +16,8 @@ import org.springframework.util.ObjectUtils;
import java.util.Arrays; import java.util.Arrays;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/** /**
* 自由排班 * 自由排班
...@@ -33,6 +33,9 @@ public class FreedomWorkAttendance extends AttendanceWorkAbstract { ...@@ -33,6 +33,9 @@ public class FreedomWorkAttendance extends AttendanceWorkAbstract {
private AttendanceRecordService attendanceRecordService; private AttendanceRecordService attendanceRecordService;
private AttendanceGroupFreeworkSpecialService specialService;
@Autowired @Autowired
private AttendanceRecordHikService recordHikService; private AttendanceRecordHikService recordHikService;
...@@ -112,6 +115,28 @@ public class FreedomWorkAttendance extends AttendanceWorkAbstract { ...@@ -112,6 +115,28 @@ public class FreedomWorkAttendance extends AttendanceWorkAbstract {
commonData.getDetailEntityList().add(recordDetailEntity); commonData.getDetailEntityList().add(recordDetailEntity);
} }
} }
//特殊日期考勤配置
List<AttendanceGroupFreeworkSpecialEntity> specialEntities = specialService.find(new AttendanceGroupFreeworkSpecialQuery().freeWorkId(attendanceGroupFreeworkEntity.getId()));
if (!ObjectUtils.isEmpty(specialEntities)) {
//分组 需要考勤与不需要考勤
Map<Boolean, List<AttendanceGroupFreeworkSpecialEntity>> collect = specialEntities.stream().collect(Collectors.partitioningBy(item -> item.getMust() == MustEnum..getValue()));
List<AttendanceGroupFreeworkSpecialEntity> mustList = collect.get(true);
if(!ObjectUtils.isEmpty(mustList)){
//需要打卡
for (AttendanceGroupFreeworkSpecialEntity specialEntity : mustList) {
}
}
List<AttendanceGroupFreeworkSpecialEntity> mustNotList = collect.get(false);
}
} }
......
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