Skip to content

yangxiujun / paidan_demo

Go to a project
Commit 32b63dab by 刘鑫
Options

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

1 parent 085f1aea
Inline Side-by-side
Showing with 3 additions and 3 deletions
project-order/src/main/java/com/dituhui/pea/order/service/impl/CapacityQueryServiceImpl.java
...@@ -161,10 +161,10 @@ public class CapacityQueryServiceImpl implements CapacityQueryService { ...@@ -161,10 +161,10 @@ public class CapacityQueryServiceImpl implements CapacityQueryService {
.sum(); .sum();
//查询单个工程师日期范围内的技能容量信息 后加和汇总 //查询单个工程师日期范围内的技能容量信息 后加和汇总
OrgBranchEntity branchInfo = orgBranchDao.getByBranchId(branchId); OrgBranchEntity branchInfo = orgBranchDao.getByBranchId(branchId);
CopyOnWriteArrayList<TimeSliceEntity> halfDayTypeTimeSlice = new CopyOnWriteArrayList<>(timeSliceDao.findByType("HALF_DAY")); CopyOnWriteArrayList<TimeSliceEntity> allDayTypeTimeSlice = new CopyOnWriteArrayList<>(timeSliceDao.findByType("ALL_DAY"));
CopyOnWriteArrayList<TimeSliceEntity> allDayTypeTimeSlice = new CopyOnWriteArrayList<>(); CopyOnWriteArrayList<TimeSliceEntity> halfDayTypeTimeSlice = new CopyOnWriteArrayList<>();
if (branchInfo.getCapacityType() == 0 || branchInfo.getCapacityType() == 2) { if (branchInfo.getCapacityType() == 0 || branchInfo.getCapacityType() == 2) {
allDayTypeTimeSlice.addAll(timeSliceDao.findByType("ALL_DAY")); halfDayTypeTimeSlice.addAll(timeSliceDao.findByType("HALF_DAY"));
} }
CopyOnWriteArrayList<TimeSliceEntity> timeSliceEntities = new CopyOnWriteArrayList<>(); CopyOnWriteArrayList<TimeSliceEntity> timeSliceEntities = new CopyOnWriteArrayList<>();
if (branchInfo.getCapacityType() == 0) { 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!