Skip to content

yangxiujun / paidan_demo

Go to a project
Commit d9c9d3ed by 刘鑫
Options

refactor(容量对外接口): 暂时解除时间段计算

1 parent 528a7d76
Inline Side-by-side
Showing with 3 additions and 3 deletions
project-order/src/main/java/com/dituhui/pea/order/service/impl/CapacityQueryServiceImpl.java
...@@ -349,14 +349,14 @@ public class CapacityQueryServiceImpl implements CapacityQueryService { ...@@ -349,14 +349,14 @@ public class CapacityQueryServiceImpl implements CapacityQueryService {
List<CapacityQueryDTO.Segment> engineerAllDay = CapacityUtils.getEngineerTypeDay(allDayTypeTimeSlice, List<CapacityQueryDTO.Segment> engineerAllDay = CapacityUtils.getEngineerTypeDay(allDayTypeTimeSlice,
allEngineerTimeSlice, currentDate, totalTakeTime); allEngineerTimeSlice, currentDate, totalTakeTime);
//计算所有工程师时间段类型容量 //计算所有工程师时间段类型容量
List<CapacityQueryDTO.Segment> timeSliceTwoHour = CapacityUtils.getEngineerTypeDay(timeSliceEntities, /*List<CapacityQueryDTO.Segment> timeSliceTwoHour = CapacityUtils.getEngineerTypeDay(timeSliceEntities,
allEngineerTimeSlice, currentDate, totalTakeTime); allEngineerTimeSlice, currentDate, totalTakeTime);*/
CapacityQueryDTO.Data data = new CapacityQueryDTO.Data(); CapacityQueryDTO.Data data = new CapacityQueryDTO.Data();
data.setDate(DateUtil.toDate(currentDate)); data.setDate(DateUtil.toDate(currentDate));
List<CapacityQueryDTO.Segment> objects = new ArrayList<>(); List<CapacityQueryDTO.Segment> objects = new ArrayList<>();
objects.addAll(engineerHalfDay); objects.addAll(engineerHalfDay);
objects.addAll(engineerAllDay); objects.addAll(engineerAllDay);
objects.addAll(timeSliceTwoHour); /*objects.addAll(timeSliceTwoHour);*/
data.setSegments(objects); data.setSegments(objects);
return data; return data;
} }
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!