Commit 67522f13 by huangjinxin

fix:工单列表返回计划时间

1 parent fbc6beaa
...@@ -100,4 +100,8 @@ public class OrderServiceList { ...@@ -100,4 +100,8 @@ public class OrderServiceList {
* 改约原因 * 改约原因
*/ */
private String reschedulingReason; private String reschedulingReason;
private String planStartTime;
private String planEndTime;
} }
...@@ -163,6 +163,9 @@ public class OrderServiceListServiceImpl implements OrderServiceListService { ...@@ -163,6 +163,9 @@ public class OrderServiceListServiceImpl implements OrderServiceListService {
record.setActualStartTime(ObjectUtil.isNull(o.getActualStartTime()) ? "" : TimeUtils.IsoTimestamp2DateTime(o.getActualStartTime())); record.setActualStartTime(ObjectUtil.isNull(o.getActualStartTime()) ? "" : TimeUtils.IsoTimestamp2DateTime(o.getActualStartTime()));
record.setActualEndTime(ObjectUtil.isNull(o.getActualEndTime()) ? "" : TimeUtils.IsoTimestamp2DateTime(o.getActualEndTime())); record.setActualEndTime(ObjectUtil.isNull(o.getActualEndTime()) ? "" : TimeUtils.IsoTimestamp2DateTime(o.getActualEndTime()));
record.setPlanStartTime(ObjectUtil.isNull(o.getPlanStartTime()) ? "" : TimeUtils.IsoTimestamp2DateTime(o.getPlanStartTime()));
record.setPlanEndTime(ObjectUtil.isNull(o.getPlanEndTime()) ? "" : TimeUtils.IsoTimestamp2DateTime(o.getPlanEndTime()));
if (StringUtils.isNotEmpty(o.getMultipleOrders())) { if (StringUtils.isNotEmpty(o.getMultipleOrders())) {
List<OrderInfoEntity> byMultipleOrders = orderInfoDao.findByMultipleOrdersAndOrderIdNot(o.getMultipleOrders(), o.getOrderId()); List<OrderInfoEntity> byMultipleOrders = orderInfoDao.findByMultipleOrdersAndOrderIdNot(o.getMultipleOrders(), o.getOrderId());
List<OrderServiceList> multipleItems = new ArrayList<>(); List<OrderServiceList> multipleItems = new ArrayList<>();
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!