From d54fbc9d4f8981fa0f7f613b33a28a8cd4f764ea Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期日, 25 十月 2026 16:29:53 +0800
Subject: [PATCH] feat(system): 优化用户搜索功能并完善ERP和MES模块验证逻辑
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/finance/ErpFinancePaymentServiceImpl.java | 65 ++++++++++++++++++++++++++++++--
1 files changed, 60 insertions(+), 5 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/finance/ErpFinancePaymentServiceImpl.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/finance/ErpFinancePaymentServiceImpl.java
index 397afd9..f4b5ebb 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/finance/ErpFinancePaymentServiceImpl.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/finance/ErpFinancePaymentServiceImpl.java
@@ -5,6 +5,9 @@
import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.bpm.api.task.BpmProcessInstanceApi;
+import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO;
+import cn.iocoder.yudao.module.bpm.enums.task.BpmTaskStatusEnum;
import cn.iocoder.yudao.module.erp.controller.admin.finance.vo.payment.ErpFinancePaymentPageReqVO;
import cn.iocoder.yudao.module.erp.controller.admin.finance.vo.payment.ErpFinancePaymentSaveReqVO;
import cn.iocoder.yudao.module.erp.dal.dataobject.finance.ErpFinancePaymentDO;
@@ -50,6 +53,11 @@
*/
private static final String FINANCE_PAYMENT_APPROVE_BIZ_TYPE = "erp_finance_payment_approve";
+ /**
+ * 浠樻鍗曞鎵圭殑 BPM 娴佺▼瀹氫箟 Key
+ */
+ private static final String FINANCE_PAYMENT_PROCESS_KEY = "erp-finance-payment-audit";
+
@Resource
private ErpFinancePaymentMapper financePaymentMapper;
@Resource
@@ -73,6 +81,9 @@
@Resource
private ApprovalConfigApi approvalConfigApi;
+
+ @Resource
+ private BpmProcessInstanceApi bpmProcessInstanceApi;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -177,7 +188,14 @@
// 2. 鏍￠獙瀹℃壒閰嶇疆宸插惎鐢ㄤ笖閰嶇疆浜嗘湁鏁堝鎵逛汉
approvalConfigApi.validateApprovalEnabledAndGetApprovers(FINANCE_PAYMENT_APPROVE_BIZ_TYPE);
// 3. 鐘舵�佺疆涓哄鎵逛腑锛屽苟娓呯┖涓婁竴杞鏍哥粨鏋�
- financePaymentMapper.submitAndResetAuditInfo(id, ErpAuditStatus.APPROVING.getStatus());
+ if (financePaymentMapper.submitAndResetAuditInfo(id, ErpAuditStatus.APPROVING.getStatus()) != 1) {
+ throw exception(FINANCE_PAYMENT_SUBMIT_FAIL_NOT_ALLOWED);
+ }
+ // 4. 鍒涘缓 BPM 娴佺▼瀹炰緥锛屼娇瀹℃壒鍑虹幇鍦ㄣ�屽崗鍚屽姙鍏� - 鎴戠殑娴佺▼銆�
+ bpmProcessInstanceApi.createProcessInstance(getLoginUserId(),
+ new BpmProcessInstanceCreateReqDTO()
+ .setProcessDefinitionKey(FINANCE_PAYMENT_PROCESS_KEY)
+ .setBusinessKey(String.valueOf(id)));
}
@Override
@@ -202,13 +220,50 @@
if (StrUtil.isBlank(reviewRemark)) {
throw exception(FINANCE_PAYMENT_AUDIT_REJECT_REASON_REQUIRED);
}
- financePaymentMapper.auditFinancePayment(id, ErpAuditStatus.PROCESS.getStatus(),
- userId, getUserNickname(userId), reviewRemark);
+ if (financePaymentMapper.auditFinancePayment(id, ErpAuditStatus.PROCESS.getStatus(),
+ userId, getUserNickname(userId), reviewRemark) != 1) {
+ throw exception(FINANCE_PAYMENT_AUDIT_FAIL_NOT_PROCESS);
+ }
return;
}
// 5. 瀹℃牳閫氳繃锛氳褰曞鏍镐汉涓庡鏍告剰瑙侊紝鐘舵�佺疆涓哄凡瀹℃牳
- financePaymentMapper.auditFinancePayment(id, ErpAuditStatus.APPROVE.getStatus(),
- userId, getUserNickname(userId), reviewRemark);
+ if (financePaymentMapper.auditFinancePayment(id, ErpAuditStatus.APPROVE.getStatus(),
+ userId, getUserNickname(userId), reviewRemark) != 1) {
+ throw exception(FINANCE_PAYMENT_AUDIT_FAIL_NOT_PROCESS);
+ }
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void updateFinancePaymentAuditStatus(Long id, Integer bpmStatus, String reason) {
+ // 1. BPM 瀹℃壒缁撴灉鏄犲皠涓轰粯娆惧崟鐘舵�侊細閫氳繃=宸插鏍革紱涓嶉�氳繃/鍙栨秷=鏈鏍革紙閫�鍥炲悗鍙慨鏀瑰苟閲嶆柊鎻愪氦锛�
+ Integer newStatus = convertBpmResultToStatus(bpmStatus);
+ if (newStatus == null) {
+ return;
+ }
+ // 2. 浠呭綋浠嶅浜庛�屽鎵逛腑銆嶆椂鍥炲啓锛岄伩鍏嶉噸澶嶈鐩�
+ if (financePaymentMapper.updateAuditStatusByBpm(id, newStatus, reason) != 1) {
+ log.warn("[updateFinancePaymentAuditStatus] 浠樻鍗�({}) 涓嶅浜庡鎵逛腑鐘舵�侊紝蹇界暐 BPM 缁撴灉({})", id, bpmStatus);
+ }
+ }
+
+ /**
+ * 杞崲 BPM 瀹℃壒缁撴灉涓轰粯娆惧崟鐘舵��
+ *
+ * 浠樻鍗曚粎鏈夈�屾湭瀹℃牳 / 瀹℃壒涓� / 宸插鏍� / 宸蹭綔搴熴�嶏紝鏃犵嫭绔嬬殑銆屽鏍镐笉閫氳繃銆嶇姸鎬侊紝
+ * 鏁呴┏鍥炴垨鎾ら攢鏃跺洖閫�鍒般�屾湭瀹℃牳銆嶏紝渚夸簬淇敼鍚庨噸鏂版彁浜わ紙涓庡師鏈夎交閲忓鎵逛竴鑷达級銆�
+ */
+ private Integer convertBpmResultToStatus(Integer bpmStatus) {
+ if (BpmTaskStatusEnum.APPROVE.getStatus().equals(bpmStatus)) {
+ return ErpAuditStatus.APPROVE.getStatus();
+ }
+ if (BpmTaskStatusEnum.REJECT.getStatus().equals(bpmStatus)) {
+ return ErpAuditStatus.PROCESS.getStatus();
+ }
+ if (BpmTaskStatusEnum.CANCEL.getStatus().equals(bpmStatus)) {
+ return ErpAuditStatus.PROCESS.getStatus();
+ }
+ return null;
}
/**
--
Gitblit v1.9.3