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-crm/src/main/java/cn/iocoder/yudao/module/crm/service/invoice/CrmInvoiceServiceImpl.java | 40 +++++++++++++++++++++++++++++++++++++---
1 files changed, 37 insertions(+), 3 deletions(-)
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/invoice/CrmInvoiceServiceImpl.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/invoice/CrmInvoiceServiceImpl.java
index 7e7b2ad..3163557 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/invoice/CrmInvoiceServiceImpl.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/invoice/CrmInvoiceServiceImpl.java
@@ -23,6 +23,9 @@
import cn.iocoder.yudao.module.crm.service.contract.CrmContractService;
import cn.iocoder.yudao.module.crm.service.permission.CrmPermissionService;
import cn.iocoder.yudao.module.crm.service.permission.bo.CrmPermissionCreateReqBO;
+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.system.api.approval.ApprovalConfigApi;
import cn.iocoder.yudao.module.system.api.storage.StorageAttachmentApi;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
@@ -65,6 +68,11 @@
private static final String INVOICE_APPROVE_BIZ_TYPE = "crm_invoice_approve";
/**
+ * CRM 寮�绁ㄥ鎵圭殑 BPM 娴佺▼瀹氫箟 Key
+ */
+ private static final String INVOICE_APPROVE_PROCESS_KEY = "crm-invoice-audit";
+
+ /**
* 鍙戠エ闄勪欢鐨勪笟鍔¤褰曠被鍨嬶紝瀵瑰簲 {@link cn.iocoder.yudao.module.system.enums.storage.StorageRecordTypeEnum#CRM_INVOICE}
*/
private static final String INVOICE_RECORD_TYPE = "crm_invoice";
@@ -86,6 +94,8 @@
private ApprovalConfigApi approvalConfigApi;
@Resource
private StorageAttachmentApi storageAttachmentApi;
+ @Resource
+ private BpmProcessInstanceApi bpmProcessInstanceApi;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -234,7 +244,13 @@
throw exception(INVOICE_SUBMIT_FAIL_NOT_EDITABLE);
}
- // 5. 璁板綍鏃ュ織
+ // 5. 鍒涘缓 BPM 娴佺▼瀹炰緥锛屼娇瀹℃壒鍑虹幇鍦ㄣ�屽崗鍚屽姙鍏� - 鎴戠殑娴佺▼銆�
+ bpmProcessInstanceApi.createProcessInstance(getLoginUserId(),
+ new BpmProcessInstanceCreateReqDTO()
+ .setProcessDefinitionKey(INVOICE_APPROVE_PROCESS_KEY)
+ .setBusinessKey(String.valueOf(id)));
+
+ // 6. 璁板綍鏃ュ織
LogRecordContext.putVariable("invoiceNo", invoice.getNo());
}
@@ -274,14 +290,32 @@
}
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void updateInvoiceAuditStatus(Long id, Integer bpmStatus, String reason) {
+ // BPM 瀹℃壒缁撴灉鏄犲皠涓哄紑绁ㄥ鏍哥姸鎬侊細閫氳繃=20 / 涓嶉�氳繃=30 / 鍙栨秷=40
+ Integer auditStatus;
+ if (BpmTaskStatusEnum.APPROVE.getStatus().equals(bpmStatus)) {
+ auditStatus = CrmAuditStatusEnum.APPROVE.getStatus();
+ } else if (BpmTaskStatusEnum.REJECT.getStatus().equals(bpmStatus)) {
+ auditStatus = CrmAuditStatusEnum.REJECT.getStatus();
+ } else if (BpmTaskStatusEnum.CANCEL.getStatus().equals(bpmStatus)) {
+ auditStatus = CrmAuditStatusEnum.CANCEL.getStatus();
+ } else {
+ return;
+ }
+ if (invoiceMapper.updateAuditStatusByBpm(id, auditStatus, reason) != 1) {
+ log.warn("[updateInvoiceAuditStatus] 寮�绁�({}) 涓嶅浜庡鎵逛腑鐘舵�侊紝蹇界暐 BPM 缁撴灉({})", id, bpmStatus);
+ }
+ }
+
/**
* 鑾峰彇鐢ㄦ埛鏄电О
*
* @param userId 鐢ㄦ埛缂栧彿
* @return 鏄电О锛岀敤鎴蜂笉瀛樺湪鏃惰繑鍥� null
*/
- private String getUserNickname(Long userId) {
- if (userId == null) {
+ private String getUserNickname(Long userId) { if (userId == null) {
return null;
}
AdminUserRespDTO user = adminUserApi.getUser(userId);
--
Gitblit v1.9.3