Commit 9d9f09a9 by 王力

Merge branch 'feature_mvp616_wangl' into 'develop'

修改

See merge request !95
2 parents 2a925bc5 17be632d
...@@ -483,10 +483,18 @@ class OrderRequestScheduler { ...@@ -483,10 +483,18 @@ class OrderRequestScheduler {
List<Line> newTasks = new ArrayList<>(); List<Line> newTasks = new ArrayList<>();
for (OrderRequest o : orderRequests) { for (OrderRequest o : orderRequests) {
if (!o.getAppointmentStatus().equals("NOT_ASSIGNED")) {
continue;
}
Line t = new Line(o.getOrderId(), 30); Line t = new Line(o.getOrderId(), 30);
newTasks.add(t); newTasks.add(t);
} }
if (newTasks.isEmpty()) {
List<LineSegment> empty = new ArrayList<>();
return empty;
}
LineSegmentScheduler scheduler = new LineSegmentScheduler(); LineSegmentScheduler scheduler = new LineSegmentScheduler();
return scheduler.scheduleLineSegments(used, newTasks); return scheduler.scheduleLineSegments(used, newTasks);
} }
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!