Commit f7d57e07 by wangli

修改

1 parent 467db209
......@@ -86,8 +86,8 @@ public class OrderAssignImpl implements OrderAssign {
item.setDistanceDesc("15.5公里");
item.setTimeDesc("520分钟");
item.setDesc(String.format("将被插入在第%d单,受此影响原第%d单变化第%d单,第3单将增加5公里路程,比预计晚到30分钟,建议调整;", rr.index + 1, rr.index + 1, rr.index + 2));
item.setStartTime("08:00");
item.setEndTime("18:00");
item.setStartTime(String.format("%s 08:00:00", date));
item.setEndTime(String.format("%s 18:00:00", date));
item.setOrders(this.packTimelines(orderAppointments, orderTips));
items.add(item);
......@@ -168,8 +168,8 @@ public class OrderAssignImpl implements OrderAssign {
item.setOrderId(order.getOrderId());
item.setPreStatus(order.getPreStatus());
item.setAppointmentStatus(order.getStatus());
item.setStartTime(TimeUtils.timestamp2DateTime(order.getExpectStartTime(), "HH:mm"));
item.setEndTime(TimeUtils.timestamp2DateTime(order.getExpectEndTime(), "HH:mm"));
item.setStartTime(TimeUtils.IsoTimestamp2DateTime(order.getExpectStartTime()));
item.setEndTime(TimeUtils.IsoTimestamp2DateTime(order.getExpectEndTime()));
item.setTips(orderTips.getOrDefault(order.getOrderId(), empty));
items.add(item);
......
......@@ -191,8 +191,8 @@ public class ScheduleServiceImpl implements ScheduleService {
ScheduleEngineerOverviewResp res = new ScheduleEngineerOverviewResp();
res.setTitle(String.format("%s_%s", groupName, engineer.getName()));
res.setEngineerCode(engineerCode);
res.setStartTime("08:00"); // TODO
res.setEndTime("18:00");
res.setStartTime(String.format("%s 08:00:00", date)); // TODO
res.setEndTime(String.format("%s 18:00:00", date));
res.setDynamics(dynamics);
res.setOrders(timelines);
res.setOrderDetails(orders);
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!