Commit 0d3df237 by 王力

Merge branch 'dev_orderlist0717' into 'develop'

修改

See merge request !249
2 parents d4203aaa 7f7b1f75
......@@ -214,7 +214,11 @@ public class DispatchServiceImpl implements DispatchService {
item.setAddress(o.getAddress());
item.setName(o.getName());
item.setPhone(o.getPhone());
item.setExpectTimeDesc(o.getExpectTimeDesc());
String time = TimeUtils.timestamp2DateTime(r.getExpectStartTime(), "HH:mm");
String timeSlot = this.parseTimeSlot(r.getExpectStartTime());
item.setExpectTimeDesc(String.format("%s/%s", time, timeSlot));
item.setSource(o.getSource());
item.setAppointmentStatus(o.getAppointmentStatus());
item.setAppointmentType(o.getAppointmentMethod());
......@@ -226,8 +230,6 @@ public class DispatchServiceImpl implements DispatchService {
item.setCategory(String.format("%s-%s", o.getType(), o.getBrand()));
item.setRemark(o.getApplyNote());
item.setCustomerName(o.getName());
String time = TimeUtils.timestamp2DateTime(r.getExpectStartTime(), "HH:mm");
String timeSlot = this.parseTimeSlot(r.getExpectStartTime());
item.setIntentionTime(String.format("%s/%s", time, timeSlot));
items.add(item);
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!