Commit 2cc5d0f5 by huluobin

update

parent 0d2e9dd3
......@@ -409,6 +409,8 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
if (ListUtil.isNotEmpty(list)) {
orderManage.setScheduleManage(list.stream().findAny().orElse(null));
}
//兼容遗留数据
if (ListUtil.isEmpty(orderManage.getListOrderServer())) {
orderManage.getListOrderServer().forEach(orderServe -> {
if (orderServe.getEndTime() != null && orderServe.getStartTime() != null) {
orderServe.setActualServeDuration((int) (orderServe.getEndTime().getTime() -
......@@ -418,6 +420,7 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
orderServe.setOrderRecord(orderRecordMap.get(orderServe.getId()).stream().findAny().orElse(null));
}
});
}
});
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