Commit 38b7aca7 by huluobin

update

parent 1c751e10
...@@ -409,6 +409,7 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order ...@@ -409,6 +409,7 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
if (ListUtil.isNotEmpty(list)) { if (ListUtil.isNotEmpty(list)) {
orderManage.setScheduleManage(list.stream().findAny().orElse(null)); orderManage.setScheduleManage(list.stream().findAny().orElse(null));
} }
if (ListUtil.isNotEmpty(orderManage.getListOrderServer())) {
orderManage.getListOrderServer().forEach(orderServe -> { orderManage.getListOrderServer().forEach(orderServe -> {
if (orderServe.getEndTime() != null && orderServe.getStartTime() != null) { if (orderServe.getEndTime() != null && orderServe.getStartTime() != null) {
orderServe.setActualServeDuration((int) (orderServe.getEndTime().getTime() - orderServe.setActualServeDuration((int) (orderServe.getEndTime().getTime() -
...@@ -418,8 +419,8 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order ...@@ -418,8 +419,8 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
orderServe.setOrderRecord(orderRecordMap.get(orderServe.getId()).stream().findAny().orElse(null)); orderServe.setOrderRecord(orderRecordMap.get(orderServe.getId()).stream().findAny().orElse(null));
} }
}); });
}
}); });
return orderManagePage; return orderManagePage;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment