Commit 32b63dab by 刘鑫

feat: 容量返回类型支持根据分部配置返回

1 parent 085f1aea
......@@ -161,10 +161,10 @@ public class CapacityQueryServiceImpl implements CapacityQueryService {
.sum();
//查询单个工程师日期范围内的技能容量信息 后加和汇总
OrgBranchEntity branchInfo = orgBranchDao.getByBranchId(branchId);
CopyOnWriteArrayList<TimeSliceEntity> halfDayTypeTimeSlice = new CopyOnWriteArrayList<>(timeSliceDao.findByType("HALF_DAY"));
CopyOnWriteArrayList<TimeSliceEntity> allDayTypeTimeSlice = new CopyOnWriteArrayList<>();
CopyOnWriteArrayList<TimeSliceEntity> allDayTypeTimeSlice = new CopyOnWriteArrayList<>(timeSliceDao.findByType("ALL_DAY"));
CopyOnWriteArrayList<TimeSliceEntity> halfDayTypeTimeSlice = new CopyOnWriteArrayList<>();
if (branchInfo.getCapacityType() == 0 || branchInfo.getCapacityType() == 2) {
allDayTypeTimeSlice.addAll(timeSliceDao.findByType("ALL_DAY"));
halfDayTypeTimeSlice.addAll(timeSliceDao.findByType("HALF_DAY"));
}
CopyOnWriteArrayList<TimeSliceEntity> timeSliceEntities = new CopyOnWriteArrayList<>();
if (branchInfo.getCapacityType() == 0) {
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!