Merge branch 'dev_engineer_dynamics0728' into 'develop'

修改

See merge request !302

project-order/src/main/java/com/dituhui/pea/order/service/impl/EngineerTimelineServiceImpl.java

@@ -157,7 +157,8 @@ public class EngineerTimelineServiceImpl implements EngineerTimelineService {
 			s.add(t.getOrderId() + t.getSuborderId());
 			s.add(t.getOrderId() + t.getSuborderId());
 		}
 		}
 
 
-		for(OrderInfo o: orders){
+		List<OrderInfo> records = orders.stream().sorted(Comparator.comparing(OrderInfo::getPlanStartTime)).collect(Collectors.toList());
+		for(OrderInfo o: records){
 			order_id = o.getOrderId() + o.getSubId();
 			order_id = o.getOrderId() + o.getSubId();
 			if (s.contains(order_id)) {
 			if (s.contains(order_id)) {
 				continue;
 				continue;