Skip to content

J
jiedao-api-boot-master
Commit 70fa3239 authored by zhengyi's avatar zhengyi
Browse files
Options

修改费用申请审批业务修正

parent d18c0ce1
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderFeeApplicationServiceImpl.java
View file @ 70fa3239
...@@ -229,6 +229,7 @@ public class OrderFeeApplicationServiceImpl extends AbstractService<OrderFeeAppl ...@@ -229,6 +229,7 @@ public class OrderFeeApplicationServiceImpl extends AbstractService<OrderFeeAppl
Integer auditType = OrderApprovalTypeResultEnum.expense_apply_processing.getType(); Integer auditType = OrderApprovalTypeResultEnum.expense_apply_processing.getType();
orderService.updateStatus(orderDO.getOrderId(), null, null, null, null, null, auditType, OrderApprovalTypeResultEnum.expense_apply_processing.getDesc()); orderService.updateStatus(orderDO.getOrderId(), null, null, null, null, null, auditType, OrderApprovalTypeResultEnum.expense_apply_processing.getDesc());
orderFeeApplicationDOOld.setBpmProcessId(String.valueOf(bpmProcessId)); orderFeeApplicationDOOld.setBpmProcessId(String.valueOf(bpmProcessId));
orderFeeApplicationDOOld.setStatus(1);
feeApplicationMapper.updateById(orderFeeApplicationDOOld); feeApplicationMapper.updateById(orderFeeApplicationDOOld);
DictDataRespDTO dictDataFromCacheOld = DictFrameworkUtils.getDictDataFromCache(DictTypeConstants.RECEIVABLE_FEE_TYPE, String.valueOf(orderFeeApplicationDOOld.getFeeType())); DictDataRespDTO dictDataFromCacheOld = DictFrameworkUtils.getDictDataFromCache(DictTypeConstants.RECEIVABLE_FEE_TYPE, String.valueOf(orderFeeApplicationDOOld.getFeeType()));
DictDataRespDTO dictDataFromCache = DictFrameworkUtils.getDictDataFromCache(DictTypeConstants.RECEIVABLE_FEE_TYPE, String.valueOf(updateReqVO.getFeeType())); DictDataRespDTO dictDataFromCache = DictFrameworkUtils.getDictDataFromCache(DictTypeConstants.RECEIVABLE_FEE_TYPE, String.valueOf(updateReqVO.getFeeType()));
...@@ -534,7 +535,7 @@ public class OrderFeeApplicationServiceImpl extends AbstractService<OrderFeeAppl ...@@ -534,7 +535,7 @@ public class OrderFeeApplicationServiceImpl extends AbstractService<OrderFeeAppl
} else { } else {
item.setReceiveFlag(0); item.setReceiveFlag(0);
} }
if (item.getStatus() == 1 && StringUtils.isNotBlank(item.getBpmProcessId())){ if (item.getStatus() == 2 && StringUtils.isNotBlank(item.getBpmProcessId())){
OrderApprovalDO approvalDO = orderApprovalService.getApproval(Long.valueOf(item.getBpmProcessId())); OrderApprovalDO approvalDO = orderApprovalService.getApproval(Long.valueOf(item.getBpmProcessId()));
if (Objects.nonNull(approvalDO) && Objects.nonNull(approvalDO.getDetails())){ if (Objects.nonNull(approvalDO) && Objects.nonNull(approvalDO.getDetails())){
OrderFeeApplicationDO feeApplicationDO = JSONObject.parseObject(approvalDO.getDetails(), OrderFeeApplicationDO.class); OrderFeeApplicationDO feeApplicationDO = JSONObject.parseObject(approvalDO.getDetails(), OrderFeeApplicationDO.class);
......
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