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 | 32 ++++++++++++++++++--------------
1 files changed, 18 insertions(+), 14 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 42d146d..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
@@ -21,7 +21,7 @@
import com.ruoyi.system.dto.AddReimbursementDTO;
import com.ruoyi.system.emums.ApprovalStatusEnum;
import com.ruoyi.system.emums.ApprovalTypeEnum;
-import com.ruoyi.system.model.OaApprovalApplicationAdvertisement;
+import com.ruoyi.system.model.OaApprovalApplicationAd;
import com.ruoyi.system.model.OaApprovalApplicationAttendance;
import com.ruoyi.system.model.OaApprovalApplicationContact;
import com.ruoyi.system.model.OaApprovalApplicationContract;
@@ -32,7 +32,7 @@
import com.ruoyi.system.model.OaApprovalApplications;
import com.ruoyi.system.model.OaApprovalFlowNode;
import com.ruoyi.system.service.ISysUserService;
-import com.ruoyi.system.service.OaApprovalApplicationAdvertisementService;
+import com.ruoyi.system.service.OaApprovalApplicationAdService;
import com.ruoyi.system.service.OaApprovalApplicationAttendanceService;
import com.ruoyi.system.service.OaApprovalApplicationContactService;
import com.ruoyi.system.service.OaApprovalApplicationContractService;
@@ -80,7 +80,7 @@
@Resource
private OaApprovalApplicationsService approvalApplicationsService;
@Resource
- private OaApprovalApplicationAdvertisementService approvalApplicationAdvertisementService;
+ private OaApprovalApplicationAdService approvalApplicationAdvertisementService;
@Resource
private OaApprovalApplicationContactService approvalApplicationContactService;
@Resource
@@ -412,9 +412,10 @@
approvalApplicationReimbursementService.save(oaApprovalApplicationReimbursement);
BigDecimal total = new BigDecimal(0);
List<OaApprovalApplicationReimbursementItem> oaApprovalApplicationReimbursementItems = new ArrayList<>();
- for (OaApprovalApplicationReimbursementItem oaApprovalApplicationReimbursementItem : oaApprovalApplicationReimbursementItems) {
- oaApprovalApplicationReimbursementItem.setApprovalApplicationId(oaApprovalApplicationReimbursement.getId());
+ for (OaApprovalApplicationReimbursementItem oaApprovalApplicationReimbursementItem : dto.getItems()) {
+ oaApprovalApplicationReimbursementItem.setApprovalApplicationId(oaApprovalApplications.getId());
total = total.add(oaApprovalApplicationReimbursementItem.getAmount());
+ oaApprovalApplicationReimbursementItems.add(oaApprovalApplicationReimbursementItem);
}
oaApprovalApplicationReimbursement.setReimbursementAmount(total);
approvalApplicationReimbursementService.updateById(oaApprovalApplicationReimbursement);
@@ -600,15 +601,15 @@
.one();
oaApprovalApplications.setCurrentFlowNodeId(approvalFlowNode.getId());
approvalApplicationsService.save(oaApprovalApplications);
- OaApprovalApplicationAdvertisement oaApprovalApplicationAdvertisement = new OaApprovalApplicationAdvertisement();
- oaApprovalApplicationAdvertisement.setApprovalApplicationId(oaApprovalApplications.getId());
- oaApprovalApplicationAdvertisement.setTitle(dto.getTitle());
- oaApprovalApplicationAdvertisement.setContent(dto.getContent());
- oaApprovalApplicationAdvertisement.setNumber(dto.getNumber());
- oaApprovalApplicationAdvertisement.setTotalAmount(dto.getTotalAmount());
- oaApprovalApplicationAdvertisement.setSpec(dto.getSpec());
- oaApprovalApplicationAdvertisement.setStatus(false);
- approvalApplicationAdvertisementService.save(oaApprovalApplicationAdvertisement);
+ OaApprovalApplicationAd oaApprovalApplicationAd = new OaApprovalApplicationAd();
+ oaApprovalApplicationAd.setApprovalApplicationId(oaApprovalApplications.getId());
+ oaApprovalApplicationAd.setTitle(dto.getTitle());
+ oaApprovalApplicationAd.setContent(dto.getContent());
+ oaApprovalApplicationAd.setNumber(dto.getNumber());
+ oaApprovalApplicationAd.setTotalAmount(dto.getTotalAmount());
+ oaApprovalApplicationAd.setSpec(dto.getSpec());
+ oaApprovalApplicationAd.setStatus(0);
+ approvalApplicationAdvertisementService.save(oaApprovalApplicationAd);
// 根据节点类型 生成代办
oaApprovalTodoService.createApprovalTodos(oaApprovalApplications.getId(), code, approvalFlowNode,
Integer.valueOf(sysUser.getDeptId()));
@@ -618,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) {
@@ -630,6 +632,8 @@
update.setId(id);
update.setApprovalStatus(ApprovalStatusEnum.CANCELED.getCode());
approvalApplicationsService.updateById(update);
+ //删除待办事项
+ oaApprovalTodoService.deleteByApplicationId(id);
return R.ok();
}
}
--
Gitblit v1.7.1