From 67e7b5fc821a35f013e7a46a5957f4c6394d236d Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 24 十月 2025 18:14:51 +0800
Subject: [PATCH] bug修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalApplicationsController.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalApplicationsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalApplicationsController.java
index 6351495..a8ca035 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalApplicationsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalApplicationsController.java
@@ -608,7 +608,7 @@
oaApprovalApplicationAd.setNumber(dto.getNumber());
oaApprovalApplicationAd.setTotalAmount(dto.getTotalAmount());
oaApprovalApplicationAd.setSpec(dto.getSpec());
- oaApprovalApplicationAd.setStatus(false);
+ oaApprovalApplicationAd.setStatus(0);
approvalApplicationAdvertisementService.save(oaApprovalApplicationAd);
// 根据节点类型 生成代办
oaApprovalTodoService.createApprovalTodos(oaApprovalApplications.getId(), code, approvalFlowNode,
@@ -619,6 +619,7 @@
@Log(title = "审批-撤回通用审批单", businessType = BusinessType.UPDATE)
@ApiOperation(value = "撤回审批单（通用接口）")
@PutMapping(value = "/withdraw/{id}")
+ @Transactional(rollbackFor = Exception.class)
public R<?> withdraw(@PathVariable Integer id) {
OaApprovalApplications current = approvalApplicationsService.getById(id);
if (current == null) {
@@ -631,6 +632,8 @@
update.setId(id);
update.setApprovalStatus(ApprovalStatusEnum.CANCELED.getCode());
approvalApplicationsService.updateById(update);
+ //删除待办事项
+ oaApprovalTodoService.deleteByApplicationId(id);
return R.ok();
}
}
--
Gitblit v1.7.1