From 3d2fd3a3f7d0571721b0f894e07c80553fd1e26c Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 10 六月 2026 11:12:05 +0800
Subject: [PATCH] fix(approve): 修复审批流程中的SQL查询和跳转路径问题
---
src/main/resources/mapper/account/purchase/AccountPaymentApplicationMapper.xml | 12 +++--
src/main/java/com/ruoyi/collaborativeApproval/service/impl/EnterpriseNewsServiceImpl.java | 2
src/main/java/com/ruoyi/approve/service/impl/ApprovalInstanceServiceImpl.java | 21 ++++++++++
src/main/resources/mapper/account/sales/AccountInvoiceApplicationMapper.xml | 10 +++--
src/main/java/com/ruoyi/approve/service/impl/FinReimbursementServiceImpl.java | 32 +++++++++++++++
5 files changed, 65 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/service/impl/ApprovalInstanceServiceImpl.java b/src/main/java/com/ruoyi/approve/service/impl/ApprovalInstanceServiceImpl.java
index 8d7477b..64a2eb3 100644
--- a/src/main/java/com/ruoyi/approve/service/impl/ApprovalInstanceServiceImpl.java
+++ b/src/main/java/com/ruoyi/approve/service/impl/ApprovalInstanceServiceImpl.java
@@ -745,10 +745,29 @@
String title = StringUtils.hasText(instance.getTemplateName()) ? instance.getTemplateName() : "瀹℃壒鎻愰啋";
String message = "瀹℃壒鍗曞彿 " + instance.getInstanceNo() + " 闇�瑕佹偍瀹℃壒";
- String jumpPath = "/officeProcessAutomation/ApproveManage/approve-list?id=" + instance.getId();
+ String jumpPath = getJumpPathByBusinessType(instance.getBusinessType(), instance.getId());
sysNoticeService.simpleNoticeByUser(title, message, approverIds, jumpPath);
}
+ private String getJumpPathByBusinessType(Long businessType, Long instanceId) {
+ if (businessType == null) {
+ return "/collaborativeApproval/approve-list?id=" + instanceId;
+ }
+ if (TypeEnums.LEAVE_APPROVAL.getCode().equals(businessType)) {
+ return "/collaborativeApproval/AttendManage/leave-apply?id=" + instanceId;
+ }
+ if (TypeEnums.OVERTIME_APPROVAL.getCode().equals(businessType)) {
+ return "/collaborativeApproval/AttendManage/overtime-apply?id=" + instanceId;
+ }
+ if (TypeEnums.TRAVEL_REIMBURSEMENT_APPROVAL.getCode().equals(businessType)) {
+ return "/collaborativeApproval/ReimburseManage/travel-reimburse?id=" + instanceId;
+ }
+ if (TypeEnums.EXPENSE_APPROVAL.getCode().equals(businessType)) {
+ return "/collaborativeApproval/ReimburseManage/cost-reimburse?id=" + instanceId;
+ }
+ return "/collaborativeApproval/approve-list?id=" + instanceId;
+ }
+
private void sendEnterpriseNewsNotice(Long newsId) {
EnterpriseNews enterpriseNews = enterpriseNewsMapper.selectById(newsId);
if (enterpriseNews == null) {
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 305ea9d..a3d33f4 100644
--- a/src/main/java/com/ruoyi/approve/service/impl/FinReimbursementServiceImpl.java
+++ b/src/main/java/com/ruoyi/approve/service/impl/FinReimbursementServiceImpl.java
@@ -274,6 +274,26 @@
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean delete(List<Long> ids) {
+ if (ids == null || ids.isEmpty()) {
+ throw new ServiceException("鍒犻櫎澶辫触锛岃閫夋嫨瑕佸垹闄ょ殑鏁版嵁");
+ }
+ // 鏌ヨ鎶ラ攢鍗曞叧鑱旂殑瀹℃壒瀹炰緥ID
+ List<FinReimbursement> reimbursements = finReimbursementMapper.selectList(
+ new LambdaQueryWrapper<FinReimbursement>()
+ .in(FinReimbursement::getId, ids)
+ .isNotNull(FinReimbursement::getApprovalInstanceId)
+ );
+ List<Long> approvalInstanceIds = reimbursements.stream()
+ .map(FinReimbursement::getApprovalInstanceId)
+ .filter(Objects::nonNull)
+ .distinct()
+ .collect(Collectors.toList());
+
+ // 鍒犻櫎鍏宠仈鐨勫鎵硅褰�
+ if (!approvalInstanceIds.isEmpty()) {
+ approvalInstanceService.delete(approvalInstanceIds);
+ }
+
fileUtil.deleteStorageAttachmentsByApplicationAndRecordTypeAndRecordIds(ApplicationTypeEnum.FILE, RecordTypeEnum.FIN_REIMBURSEMENT, ids);
//鍏堝垹闄ゆ槑缁�
finReimbursementDetailMapper.delete(new LambdaQueryWrapper<FinReimbursementDetail>().in(FinReimbursementDetail::getReimbursementId, ids));
@@ -494,10 +514,20 @@
}
String title = "鎶ラ攢瀹℃壒";
String message = "瀹℃壒鍗曞彿 " + instance.getInstanceNo() + " 闇�瑕佹偍瀹℃壒";
- String jumpPath = "/approvalInstance?id=" + instance.getId();
+ String jumpPath = getJumpPathByBusinessType(instance.getBusinessType(), instance.getId());
sysNoticeService.simpleNoticeByUser(title, message, approverIds, jumpPath);
}
+ private String getJumpPathByBusinessType(Long businessType, Long instanceId) {
+ if (TypeEnums.TRAVEL_REIMBURSEMENT_APPROVAL.getCode().equals(businessType)) {
+ return "/collaborativeApproval/ReimburseManage/travel-reimburse?id=" + instanceId;
+ }
+ if (TypeEnums.EXPENSE_APPROVAL.getCode().equals(businessType)) {
+ return "/collaborativeApproval/ReimburseManage/cost-reimburse?id=" + instanceId;
+ }
+ return "/approvalInstance?id=" + instanceId;
+ }
+
private void resetApprovalFlow(FinReimbursement existing, Long reimbursementId) {
if (existing == null || existing.getApprovalInstanceId() == null) {
return;
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/service/impl/EnterpriseNewsServiceImpl.java b/src/main/java/com/ruoyi/collaborativeApproval/service/impl/EnterpriseNewsServiceImpl.java
index 4a4d9c1..daa1c89 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/service/impl/EnterpriseNewsServiceImpl.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/service/impl/EnterpriseNewsServiceImpl.java
@@ -403,7 +403,7 @@
String title = StringUtils.isNotEmpty(instance.getTemplateName()) ? instance.getTemplateName() : "瀹℃壒鎻愰啋";
String message = "瀹℃壒鍗曞彿 " + instance.getInstanceNo() + " 闇�瑕佹偍瀹℃壒";
- String jumpPath = "/officeProcessAutomation/ApproveManage/approve-list/?id=" + instance.getId();
+ String jumpPath = "/collaborativeApproval/approve-list/?id=" + instance.getId();
sysNoticeService.simpleNoticeByUser(title, message, approverIds, jumpPath);
}
}
diff --git a/src/main/resources/mapper/account/purchase/AccountPaymentApplicationMapper.xml b/src/main/resources/mapper/account/purchase/AccountPaymentApplicationMapper.xml
index 267de0b..f4d6284 100644
--- a/src/main/resources/mapper/account/purchase/AccountPaymentApplicationMapper.xml
+++ b/src/main/resources/mapper/account/purchase/AccountPaymentApplicationMapper.xml
@@ -88,12 +88,14 @@
</select>
<select id="existsByStockInRecordId" resultType="java.lang.Boolean">
- SELECT COUNT(*) > 0
+ SELECT COUNT(*) > 0
FROM account_payment_application
- WHERE status != 2
- <foreach collection="stockInRecordIds" item="id" open="(" separator=" OR " close=")">
- FIND_IN_SET(#{id}, stock_in_record_ids)
- </foreach>
+ WHERE status != 2
+ AND (
+ <foreach collection="stockInRecordIds" item="id" separator=" OR ">
+ FIND_IN_SET(#{id}, stock_in_record_ids) > 0
+ </foreach>
+ )
</select>
</mapper>
diff --git a/src/main/resources/mapper/account/sales/AccountInvoiceApplicationMapper.xml b/src/main/resources/mapper/account/sales/AccountInvoiceApplicationMapper.xml
index 7884e75..3c74a44 100644
--- a/src/main/resources/mapper/account/sales/AccountInvoiceApplicationMapper.xml
+++ b/src/main/resources/mapper/account/sales/AccountInvoiceApplicationMapper.xml
@@ -65,10 +65,12 @@
<select id="existsByStockOutRecordId" resultType="java.lang.Boolean">
SELECT COUNT(*) > 0
FROM account_invoice_application
- WHERE status!=2
- <foreach collection="stockOutRecordIds" item="id" open="(" separator=" OR " close=")">
- FIND_IN_SET(#{id}, stock_out_record_ids)
- </foreach>
+ WHERE status != 2
+ AND (
+ <foreach collection="stockOutRecordIds" item="id" separator=" OR ">
+ FIND_IN_SET(#{id}, stock_out_record_ids) > 0
+ </foreach>
+ )
</select>
</mapper>
--
Gitblit v1.9.3