Commit 0b8494e0 by huangjinxin

fix:服务变更记录服务开始结束时间

1 parent 63ba6ded
...@@ -151,6 +151,12 @@ public class OrderInfoServiceImpl implements OrderInfoService { ...@@ -151,6 +151,12 @@ public class OrderInfoServiceImpl implements OrderInfoService {
if (StringUtils.isNotBlank(request.getDescription())) { if (StringUtils.isNotBlank(request.getDescription())) {
orderInfo.setDescription(request.getDescription()); orderInfo.setDescription(request.getDescription());
} }
if (BeanServiceFlowEnum.STARTED.getStatus().equals(BeanServiceFlowEnum.getStatusByName(request.getStage()))) {
orderInfo.setActualStartTime(LocalDateTimeUtil.of(request.getHappen()));
}
if (BeanServiceFlowEnum.FINISHED.getStatus().equals(BeanServiceFlowEnum.getStatusByName(request.getStage()))) {
orderInfo.setActualEndTime(LocalDateTimeUtil.of(request.getHappen()));
}
orderInfoDao.save(orderInfo); orderInfoDao.save(orderInfo);
//记录流程 //记录流程
commonService.addOrderEvent(request.getOrderId(), "", "BEAN", "BEAN", OrderStatusEnum.NORMAL.getDescription(), request.getStage(), "", LocalDateTimeUtil.of(request.getHappen())); commonService.addOrderEvent(request.getOrderId(), "", "BEAN", "BEAN", OrderStatusEnum.NORMAL.getDescription(), request.getStage(), "", LocalDateTimeUtil.of(request.getHappen()));
...@@ -336,7 +342,7 @@ public class OrderInfoServiceImpl implements OrderInfoService { ...@@ -336,7 +342,7 @@ public class OrderInfoServiceImpl implements OrderInfoService {
//处理一家多单 //处理一家多单
// order = handleMultipleOrders(order); // order = handleMultipleOrders(order);
if (!orderDt.isEqual(expectBegin.toLocalDate())){ if (!orderDt.isEqual(expectBegin.toLocalDate())) {
order = handleMultipleOrders(order); order = handleMultipleOrders(order);
} }
order.setOrgClusterId(clusterId); order.setOrgClusterId(clusterId);
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!