Commit 71372d65 by 丁伟峰

Merge remote-tracking branch 'origin/develop' into develop

2 parents 34111079 252077bc
......@@ -105,12 +105,12 @@ public class OrderAssignCheck {
OrderSegment pre = orderSegments.get(index);
// 为当前订单
OrderSegment post = new OrderSegment(start, end, Double.parseDouble(order.getX()), Double.parseDouble(order.getY()));
return this.getResult(curX, curY, pre, post, takeTime, order.getDt());
} else {
OrderSegment pre = orderSegments.get(index);
OrderSegment post = orderSegments.get(index+1);
return this.getResult(curX, curY, pre, post, takeTime, order.getDt());
}
return null;
}
private List<OrderSegment> getEngineerOrderSegments(String engineerCode, LocalDate dt) {
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!