From 5421b8af862890dcf187c2ad5ece55423959ba85 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期五, 23 十月 2026 19:27:14 +0800
Subject: [PATCH] feat(bpm): 全部业务审批流改回 BPM，审批统一进入协同办公
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/miscreceipt/MesWmMiscReceiptServiceImpl.java | 35 +++++++++++++++++++++++++++++++++++
1 files changed, 35 insertions(+), 0 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/miscreceipt/MesWmMiscReceiptServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/miscreceipt/MesWmMiscReceiptServiceImpl.java
index 904b168..fe2bbaa 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/miscreceipt/MesWmMiscReceiptServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/miscreceipt/MesWmMiscReceiptServiceImpl.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.mes.controller.admin.wm.miscreceipt.vo.MesWmMiscReceiptImportExcelVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.miscreceipt.vo.MesWmMiscReceiptImportRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.miscreceipt.vo.MesWmMiscReceiptPageReqVO;
@@ -53,8 +56,16 @@
*/
private static final String MISC_RECEIPT_APPROVE_BIZ_TYPE = "misc_receipt_approve";
+ /**
+ * 鏉傞」鍏ュ簱鍗曞鎵圭殑 BPM 娴佺▼瀹氫箟 Key
+ */
+ private static final String MISC_RECEIPT_APPROVE_PROCESS_KEY = "misc_receipt_approve";
+
@Resource
private MesWmMiscReceiptMapper miscReceiptMapper;
+
+ @Resource
+ private BpmProcessInstanceApi bpmProcessInstanceApi;
@Resource
@Lazy
@@ -126,6 +137,30 @@
approvalConfigApi.validateApprovalEnabledAndGetApprovers(MISC_RECEIPT_APPROVE_BIZ_TYPE);
// 4. 鎻愪氦瀹℃壒锛堣崏绋� 鈫� 瀹℃壒涓級锛屽苟娓呯┖涓婁竴杞鏍哥粨鏋�
miscReceiptMapper.submitAndResetAuditInfo(id, MesWmMiscReceiptStatusEnum.APPROVING.getStatus());
+ // 5. 鍒涘缓 BPM 娴佺▼瀹炰緥锛屼娇瀹℃壒鍑虹幇鍦ㄣ�屽崗鍚屽姙鍏� - 鎴戠殑娴佺▼銆�
+ bpmProcessInstanceApi.createProcessInstance(getLoginUserId(),
+ new BpmProcessInstanceCreateReqDTO()
+ .setProcessDefinitionKey(MISC_RECEIPT_APPROVE_PROCESS_KEY)
+ .setBusinessKey(String.valueOf(id)));
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void updateMiscReceiptAuditStatus(Long id, Integer bpmStatus, String reason) {
+ // BPM 瀹℃壒缁撴灉鏄犲皠涓哄崟鎹姸鎬侊細閫氳繃=宸插鎵� / 涓嶉�氳繃=鑽夌 / 鍙栨秷=宸插彇娑�
+ Integer status;
+ if (BpmTaskStatusEnum.APPROVE.getStatus().equals(bpmStatus)) {
+ status = MesWmMiscReceiptStatusEnum.APPROVED.getStatus();
+ } else if (BpmTaskStatusEnum.REJECT.getStatus().equals(bpmStatus)) {
+ status = MesWmMiscReceiptStatusEnum.PREPARE.getStatus();
+ } else if (BpmTaskStatusEnum.CANCEL.getStatus().equals(bpmStatus)) {
+ status = MesWmMiscReceiptStatusEnum.CANCELED.getStatus();
+ } else {
+ return;
+ }
+ if (miscReceiptMapper.updateAuditStatusByBpm(id, status, reason) != 1) {
+ log.warn("[updateMiscReceiptAuditStatus] 鏉傞」鍏ュ簱鍗�({}) 涓嶅浜庡鎵逛腑鐘舵�侊紝蹇界暐 BPM 缁撴灉({})", id, bpmStatus);
+ }
}
@Override
--
Gitblit v1.9.3