Commit 6e3a3d11 authored by 332784038@qq.com's avatar 332784038@qq.com

订单费用列表返回批量申请的审批id

parent 1d7bf23c
...@@ -186,7 +186,6 @@ public class OrderFeeApplicationServiceImpl extends AbstractService<OrderFeeAppl ...@@ -186,7 +186,6 @@ public class OrderFeeApplicationServiceImpl extends AbstractService<OrderFeeAppl
orderApprovalDO.setStatus(ApprovalResultStatusEnum.processing.getValue()); orderApprovalDO.setStatus(ApprovalResultStatusEnum.processing.getValue());
Long bpmProcessId = orderApprovalService.applyAndCreate(orderApprovalDO, WorkFlowEmus.ORDER_BATCH_FREE_APPLY, createReqVO.getCopyUserId()); Long bpmProcessId = orderApprovalService.applyAndCreate(orderApprovalDO, WorkFlowEmus.ORDER_BATCH_FREE_APPLY, createReqVO.getCopyUserId());
//创建审批流 //创建审批流
OrderDO orderDO = orderService.selectOne(OrderDO::getOrderId, createReqVO.getOrderId()); OrderDO orderDO = orderService.selectOne(OrderDO::getOrderId, createReqVO.getOrderId());
...@@ -195,6 +194,7 @@ public class OrderFeeApplicationServiceImpl extends AbstractService<OrderFeeAppl ...@@ -195,6 +194,7 @@ public class OrderFeeApplicationServiceImpl extends AbstractService<OrderFeeAppl
//更新费用列表对应的流程申请ID //更新费用列表对应的流程申请ID
for (OrderFeeApplicationDO feeApplication : batchFeeList) { for (OrderFeeApplicationDO feeApplication : batchFeeList) {
feeApplication.setBatchBpmBusinessId(String.valueOf(bpmProcessId)); feeApplication.setBatchBpmBusinessId(String.valueOf(bpmProcessId));
feeApplication.setBpmProcessId(String.valueOf(bpmProcessId));
feeApplication.setStatus(ApprovalResultStatusEnum.processing.getValue()); feeApplication.setStatus(ApprovalResultStatusEnum.processing.getValue());
feeApplicationMapper.updateById(feeApplication); feeApplicationMapper.updateById(feeApplication);
} }
......
...@@ -92,6 +92,11 @@ public class OrderFeeApplicationBackVO { ...@@ -92,6 +92,11 @@ public class OrderFeeApplicationBackVO {
@ApiModelProperty(value = "审批流程编号") @ApiModelProperty(value = "审批流程编号")
private String bpmProcessId; private String bpmProcessId;
@ExcelProperty("批量费用审核时业务主键ID")
@ApiModelProperty(value = "批量费用审核时业务主键ID")
private String batchBpmBusinessId;
@ApiModelProperty(value = "始发仓") @ApiModelProperty(value = "始发仓")
private String startWarehouse; private String startWarehouse;
......
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