Skip to content

yangxiujun / paidan_demo

Go to a project
Commit c4221824 by 刘鑫
Options

feat(时间片容量):

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