From 3ce8c1cfbf2b0a577c8fbb155128dc85c3857606 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 16 六月 2026 13:47:34 +0800
Subject: [PATCH] fix(approval): 修复审批实例创建中的业务ID和模板查询问题
---
src/main/java/com/ruoyi/sales/service/impl/SalesQuotationServiceImpl.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/service/impl/SalesQuotationServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/SalesQuotationServiceImpl.java
index 5e31cfa..ceeed16 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesQuotationServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesQuotationServiceImpl.java
@@ -105,8 +105,13 @@
salesQuotationProductService.saveBatch(products);
// 鎶ヤ环瀹℃壒
ApprovalInstanceDto approvalInstance = new ApprovalInstanceDto();
- approvalInstance.setTemplateId(approvalTemplateMapper.selectOne(new LambdaQueryWrapper<ApprovalTemplate>().eq(ApprovalTemplate::getBusinessType,6L).orderByDesc(ApprovalTemplate::getId).last("LIMIT 1")).getId());
- approvalInstance.setTemplateName(approvalTemplateMapper.selectOne(new LambdaQueryWrapper<ApprovalTemplate>().eq(ApprovalTemplate::getBusinessType,6L).orderByDesc(ApprovalTemplate::getId).last("LIMIT 1")).getTemplateName());
+ ApprovalTemplate quotationTemplate = approvalTemplateMapper.selectOne(new LambdaQueryWrapper<ApprovalTemplate>()
+ .eq(ApprovalTemplate::getBusinessType, 6L)
+ .eq(ApprovalTemplate::getDeleted, 0)
+ .orderByDesc(ApprovalTemplate::getId)
+ .last("LIMIT 1"));
+ approvalInstance.setTemplateId(quotationTemplate.getId());
+ approvalInstance.setTemplateName(quotationTemplate.getTemplateName());
approvalInstance.setBusinessId(salesQuotation.getId());
approvalInstance.setBusinessType(6L);
approvalInstance.setCurrentLevel(1);
@@ -151,8 +156,13 @@
approvalInstanceService.lambdaUpdate().set(ApprovalInstance::getStatus,"REJECTED").eq(ApprovalInstance::getBusinessId,salesQuotation.getId()).eq(ApprovalInstance::getBusinessType,6L).update();
ApprovalInstanceDto approvalInstance = new ApprovalInstanceDto();
- approvalInstance.setTemplateId(approvalTemplateMapper.selectOne(new LambdaQueryWrapper<ApprovalTemplate>().eq(ApprovalTemplate::getBusinessType,6L).orderByDesc(ApprovalTemplate::getId).last("LIMIT 1")).getId());
- approvalInstance.setTemplateName(approvalTemplateMapper.selectOne(new LambdaQueryWrapper<ApprovalTemplate>().eq(ApprovalTemplate::getBusinessType,6L).orderByDesc(ApprovalTemplate::getId).last("LIMIT 1")).getTemplateName());
+ ApprovalTemplate reSubmitTemplate = approvalTemplateMapper.selectOne(new LambdaQueryWrapper<ApprovalTemplate>()
+ .eq(ApprovalTemplate::getBusinessType, 6L)
+ .eq(ApprovalTemplate::getDeleted, 0)
+ .orderByDesc(ApprovalTemplate::getId)
+ .last("LIMIT 1"));
+ approvalInstance.setTemplateId(reSubmitTemplate.getId());
+ approvalInstance.setTemplateName(reSubmitTemplate.getTemplateName());
approvalInstance.setBusinessId(salesQuotation.getId());
approvalInstance.setBusinessType(6L);
approvalInstance.setCurrentLevel(1);
--
Gitblit v1.9.3