Commit 92e50bd9 authored by zhengyi's avatar zhengyi

批量审批业务调整,并兼容批量批量修改后的批量审批提交

parent 02679082
...@@ -479,12 +479,6 @@ public class OrderFeeApplicationServiceImpl extends AbstractService<OrderFeeAppl ...@@ -479,12 +479,6 @@ public class OrderFeeApplicationServiceImpl extends AbstractService<OrderFeeAppl
batchFeeList = this.list(lambdaQueryWrapper); batchFeeList = this.list(lambdaQueryWrapper);
} }
for (OrderFeeApplicationDO feeApplicationDO : batchFeeList) { for (OrderFeeApplicationDO feeApplicationDO : batchFeeList) {
feeApplicationDO.setStatus(result);
if (Objects.nonNull(feeApplicationDO.getId())){
feeApplicationMapper.updateById(feeApplicationDO);
}else {
feeApplicationMapper.insert(feeApplicationDO);
}
//生成应收 //生成应收
DictDataRespDTO dictDto = DictFrameworkUtils.getDictDataFromCache("receivable_fee_type", String.valueOf(feeApplicationDO.getFeeType())); DictDataRespDTO dictDto = DictFrameworkUtils.getDictDataFromCache("receivable_fee_type", String.valueOf(feeApplicationDO.getFeeType()));
if (feeApplicationDO.getReceivableId() != null && feeApplicationDO.getReceivableId() > 0) { if (feeApplicationDO.getReceivableId() != null && feeApplicationDO.getReceivableId() > 0) {
...@@ -529,8 +523,12 @@ public class OrderFeeApplicationServiceImpl extends AbstractService<OrderFeeAppl ...@@ -529,8 +523,12 @@ public class OrderFeeApplicationServiceImpl extends AbstractService<OrderFeeAppl
Long receivableId = receivableService.createReceivable(receivableCreateReqVO); Long receivableId = receivableService.createReceivable(receivableCreateReqVO);
feeApplicationDO.setReceivableId(receivableId.intValue()); feeApplicationDO.setReceivableId(receivableId.intValue());
} }
feeApplicationDO.setStatus(ApprovalResultStatusEnum.pass.getValue()); feeApplicationDO.setStatus(result);
feeApplicationMapper.updateById(feeApplicationDO); if (Objects.nonNull(feeApplicationDO.getId())){
feeApplicationMapper.updateById(feeApplicationDO);
}else {
feeApplicationMapper.insert(feeApplicationDO);
}
FeeDto feeDto = new FeeDto(); FeeDto feeDto = new FeeDto();
feeDto.setFeeType(feeApplicationDO.getFeeType()); feeDto.setFeeType(feeApplicationDO.getFeeType());
feeDto.setAmount(feeApplicationDO.getApplicationFee()); feeDto.setAmount(feeApplicationDO.getApplicationFee());
......
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