Merge branch 'dev_engineer_dynamics0728' into 'develop'

修改

See merge request !301

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

@@ -143,11 +143,7 @@ public class EngineerTimelineServiceImpl implements EngineerTimelineService {
 				type = "other";
 				type = "other";
 				location = locations.get(t.getOrderId());
 				location = locations.get(t.getOrderId());
 			} else {
 			} else {
-				index += 1;
-				title = String.format("第%d单出发", index);
-				text = String.format("%d", index);
-				type = "order";
-				location = locations.get(t.getOrderId());
+				continue;
 			}
 			}
 			item.setTitle(title);
 			item.setTitle(title);
 			item.setTime(TimeUtils.IsoTimestamp2DateTime(t.getHappen()));
 			item.setTime(TimeUtils.IsoTimestamp2DateTime(t.getHappen()));
@@ -179,4 +175,4 @@ public class EngineerTimelineServiceImpl implements EngineerTimelineService {
 		// 根据items的time升序排序
 		// 根据items的time升序排序
 		return items.stream().sorted(Comparator.comparing(EngineerTimelineResp.DynamicItem::getTime)).collect(Collectors.toList());
 		return items.stream().sorted(Comparator.comparing(EngineerTimelineResp.DynamicItem::getTime)).collect(Collectors.toList());
 	}
 	}
-}
+}
\ No newline at end of file