From 28d6f88c4122d6276c8e9dd6a817c4b3675551aa Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 26 五月 2026 09:24:09 +0800
Subject: [PATCH] feat:1.销售采购合同按照录入日期生成 2.采购合同号按照录入日期生成
---
src/main/java/com/ruoyi/approve/service/impl/FinReimbursementServiceImpl.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/service/impl/FinReimbursementServiceImpl.java b/src/main/java/com/ruoyi/approve/service/impl/FinReimbursementServiceImpl.java
index a69bb76..1861d83 100644
--- a/src/main/java/com/ruoyi/approve/service/impl/FinReimbursementServiceImpl.java
+++ b/src/main/java/com/ruoyi/approve/service/impl/FinReimbursementServiceImpl.java
@@ -199,7 +199,7 @@
}
}
- resetApprovalFlow(existing.getApprovalInstanceId(), reimbursementId);
+ resetApprovalFlow(existing, reimbursementId);
if (BILL_STATUS_IN_APPROVAL.equals(billStatus)) {
reimbursement.setApprovalInstanceId(null);
startApproval(reimbursement, finReimbursementDto);
@@ -498,11 +498,18 @@
sysNoticeService.simpleNoticeByUser(title, message, approverIds, jumpPath);
}
- private void resetApprovalFlow(Long approvalInstanceId, Long reimbursementId) {
- if (approvalInstanceId == null) {
+ private void resetApprovalFlow(FinReimbursement existing, Long reimbursementId) {
+ if (existing == null || existing.getApprovalInstanceId() == null) {
return;
}
- approvalInstanceService.delete(Collections.singletonList(approvalInstanceId));
+ Long approvalInstanceId = existing.getApprovalInstanceId();
+ if (!"REJECTED".equals(existing.getBillStatus())) {
+ approvalInstanceService.delete(Collections.singletonList(approvalInstanceId));
+ }
+ clearApprovalBinding(reimbursementId);
+ }
+
+ private void clearApprovalBinding(Long reimbursementId) {
int rows = finReimbursementMapper.update(
null,
Wrappers.<FinReimbursement>lambdaUpdate()
--
Gitblit v1.9.3