Commit 7213a50a by 王力

Merge branch 'dev_engineer_dynamics0728' into 'develop'

修改

See merge request !301
2 parents fa366b37 a6014c1e
......@@ -143,11 +143,7 @@ public class EngineerTimelineServiceImpl implements EngineerTimelineService {
type = "other";
location = locations.get(t.getOrderId());
} 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.setTime(TimeUtils.IsoTimestamp2DateTime(t.getHappen()));
......@@ -179,4 +175,4 @@ public class EngineerTimelineServiceImpl implements EngineerTimelineService {
// 根据items的time升序排序
return items.stream().sorted(Comparator.comparing(EngineerTimelineResp.DynamicItem::getTime)).collect(Collectors.toList());
}
}
}
\ No newline at end of file
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!