From 7d2ee3cef2e0d68ba6400bc5957640d2771bbf4c Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期三, 16 九月 2026 18:05:40 +0800
Subject: [PATCH] refactor: 单据审核改为审批配置状态机（新增:audit接口/审核人字段/DB变更脚本）
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/finance/ErpFinancePaymentServiceImpl.java | 136 ++++++++++++++-------------------------------
1 files changed, 42 insertions(+), 94 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 5fdd106..397afd9 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
@@ -2,15 +2,9 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
+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.dal.dataobject.definition.BpmCategoryDO;
-import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmProcessDefinitionInfoDO;
-import cn.iocoder.yudao.module.bpm.enums.task.BpmTaskStatusEnum;
-import cn.iocoder.yudao.module.bpm.service.definition.BpmCategoryService;
-import cn.iocoder.yudao.module.bpm.service.definition.BpmProcessDefinitionService;
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;
@@ -23,11 +17,12 @@
import cn.iocoder.yudao.module.erp.service.purchase.ErpPurchaseInvoiceService;
import cn.iocoder.yudao.module.erp.service.purchase.ErpPurchaseInvoiceServiceImpl;
import cn.iocoder.yudao.module.erp.service.purchase.ErpSupplierService;
+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;
+import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
-import org.flowable.engine.repository.ProcessDefinition;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
@@ -37,6 +32,7 @@
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.*;
/**
@@ -50,9 +46,9 @@
public class ErpFinancePaymentServiceImpl implements ErpFinancePaymentService {
/**
- * BPM 浠樻鍗曞鎵瑰垎绫荤紪鐮�
+ * 閫氱敤瀹℃壒閰嶇疆鐨勪笟鍔＄被鍨嬬紪鐮侊紙瀵瑰簲 system_approval_config.biz_type锛�
*/
- private static final String BPM_PROCESS_DEFINITION_CATEGORY_CODE = "erp_finance_payment_approve";
+ private static final String FINANCE_PAYMENT_APPROVE_BIZ_TYPE = "erp_finance_payment_approve";
@Resource
private ErpFinancePaymentMapper financePaymentMapper;
@@ -76,11 +72,7 @@
private StorageAttachmentApi storageAttachmentApi;
@Resource
- private BpmProcessInstanceApi processInstanceApi;
- @Resource
- private BpmCategoryService bpmCategoryService;
- @Resource
- private BpmProcessDefinitionService bpmProcessDefinitionService;
+ private ApprovalConfigApi approvalConfigApi;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -176,105 +168,61 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void submitFinancePayment(Long id, String processDefinitionKey, Long userId) {
- // 1. 鏍￠獙瀛樺湪 + 鏈鏍哥姸鎬�
+ public void submitFinancePayment(Long id) {
+ // 1. 鏍￠獙瀛樺湪 + 鍙彁浜ょ姸鎬侊紙鏈鏍革細鍚鏍镐笉閫氳繃閫�鍥炲悗閲嶆柊鎻愪氦锛�
ErpFinancePaymentDO payment = validateFinancePaymentExists(id);
if (!ErpAuditStatus.PROCESS.getStatus().equals(payment.getStatus())) {
- throw exception(FINANCE_PAYMENT_SUBMIT_FAIL_STATUS);
+ throw exception(FINANCE_PAYMENT_SUBMIT_FAIL_NOT_ALLOWED);
}
-
- // 2. 鍒涘缓 BPM 娴佺▼瀹炰緥
- String processInstanceId = processInstanceApi.createProcessInstance(userId,
- new BpmProcessInstanceCreateReqDTO()
- .setProcessDefinitionKey(processDefinitionKey)
- .setBusinessKey(String.valueOf(id)));
-
- // 3. 鏇存柊浠樻鍗曠姸鎬佷负瀹℃壒涓�
- financePaymentMapper.updateById(new ErpFinancePaymentDO()
- .setId(id)
- .setStatus(ErpAuditStatus.APPROVING.getStatus())
- .setProcessInstanceId(processInstanceId));
+ // 2. 鏍￠獙瀹℃壒閰嶇疆宸插惎鐢ㄤ笖閰嶇疆浜嗘湁鏁堝鎵逛汉
+ approvalConfigApi.validateApprovalEnabledAndGetApprovers(FINANCE_PAYMENT_APPROVE_BIZ_TYPE);
+ // 3. 鐘舵�佺疆涓哄鎵逛腑锛屽苟娓呯┖涓婁竴杞鏍哥粨鏋�
+ financePaymentMapper.submitAndResetAuditInfo(id, ErpAuditStatus.APPROVING.getStatus());
}
@Override
- public List<Map<String, Object>> getFinancePaymentApproveProcessDefinitionList() {
- // 1. 鏍￠獙鍒嗙被鍜屾祦绋嬪畾涔夋槸鍚﹀瓨鍦�
- validateFinancePaymentApproveCategoryAndProcessDefinition();
-
- // 2. 鑾峰彇鍒嗙被涓嬬殑娴佺▼瀹氫箟淇℃伅
- List<BpmProcessDefinitionInfoDO> definitionInfoList = bpmProcessDefinitionService
- .getProcessDefinitionInfoListByCategory(BPM_PROCESS_DEFINITION_CATEGORY_CODE);
- if (CollUtil.isEmpty(definitionInfoList)) {
- return Collections.emptyList();
- }
-
- // 3. 閬嶅巻鑾峰彇娴佺▼瀹氫箟璇︽儏锛岃繃婊ゆ縺娲荤姸鎬侊紝淇濈暀鏈�鏂扮増鏈�
- Map<String, ProcessDefinition> latestVersionMap = new HashMap<>();
- for (BpmProcessDefinitionInfoDO info : definitionInfoList) {
- ProcessDefinition pd = bpmProcessDefinitionService.getProcessDefinition(info.getProcessDefinitionId());
- if (pd == null || pd.isSuspended()) {
- continue;
- }
- ProcessDefinition existing = latestVersionMap.get(pd.getKey());
- if (existing == null || pd.getVersion() > existing.getVersion()) {
- latestVersionMap.put(pd.getKey(), pd);
- }
- }
-
- // 4. 杩斿洖娴佺▼瀹氫箟鍒楄〃
- List<Map<String, Object>> result = new ArrayList<>();
- for (ProcessDefinition pd : latestVersionMap.values()) {
- Map<String, Object> item = new HashMap<>();
- item.put("id", pd.getId());
- item.put("key", pd.getKey());
- item.put("name", pd.getName());
- result.add(item);
- }
- return result;
+ public Set<Long> getFinancePaymentApproverUserIds() {
+ return approvalConfigApi.getApproverUserIds(FINANCE_PAYMENT_APPROVE_BIZ_TYPE);
}
@Override
@Transactional(rollbackFor = Exception.class)
- public void updateFinancePaymentAuditStatus(Long id, Integer bpmResult) {
+ public void auditFinancePayment(Long id, Boolean pass, String reviewRemark) {
// 1. 鏍￠獙瀛樺湪
ErpFinancePaymentDO payment = validateFinancePaymentExists(id);
+ // 2. 鏍￠獙澶勪簬瀹℃壒涓姸鎬�
if (!ErpAuditStatus.APPROVING.getStatus().equals(payment.getStatus())) {
- log.warn("[updateFinancePaymentAuditStatus] 浠樻鍗�({}) 涓嶅浜庡鎵逛腑鐘舵��", id);
+ throw exception(FINANCE_PAYMENT_AUDIT_FAIL_NOT_PROCESS);
+ }
+ // 3. 鏍￠獙褰撳墠鐧诲綍鐢ㄦ埛鏄涓氬姟绫诲瀷鐨勫鎵逛汉锛堟垨绛撅細浠讳竴浜哄潎鍙鏍革級
+ Long userId = getLoginUserId();
+ approvalConfigApi.validateApprover(FINANCE_PAYMENT_APPROVE_BIZ_TYPE, userId);
+ // 4. 瀹℃牳涓嶉�氳繃锛氬繀椤诲～鍐欏師鍥狅紝閫�鍥炶储鍔′汉鍛樹慨鏀瑰悗鍙噸鏂版彁浜�
+ if (!Boolean.TRUE.equals(pass)) {
+ if (StrUtil.isBlank(reviewRemark)) {
+ throw exception(FINANCE_PAYMENT_AUDIT_REJECT_REASON_REQUIRED);
+ }
+ financePaymentMapper.auditFinancePayment(id, ErpAuditStatus.PROCESS.getStatus(),
+ userId, getUserNickname(userId), reviewRemark);
return;
}
-
- // 2. 鏍规嵁瀹℃壒缁撴灉鏇存柊鐘舵��
- Integer newStatus = convertBpmResultToAuditStatus(bpmResult);
- if (newStatus != null) {
- financePaymentMapper.updateById(new ErpFinancePaymentDO()
- .setId(id).setStatus(newStatus));
- }
+ // 5. 瀹℃牳閫氳繃锛氳褰曞鏍镐汉涓庡鏍告剰瑙侊紝鐘舵�佺疆涓哄凡瀹℃牳
+ financePaymentMapper.auditFinancePayment(id, ErpAuditStatus.APPROVE.getStatus(),
+ userId, getUserNickname(userId), reviewRemark);
}
/**
- * 鏍￠獙浠樻鍗曞鎵瑰垎绫诲拰娴佺▼瀹氫箟鏄惁瀛樺湪
+ * 鑾峰彇鐢ㄦ埛鏄电О
+ *
+ * @param userId 鐢ㄦ埛缂栧彿
+ * @return 鏄电О锛岀敤鎴蜂笉瀛樺湪鏃惰繑鍥� null
*/
- private void validateFinancePaymentApproveCategoryAndProcessDefinition() {
- // 1. 鏍￠獙鍒嗙被鏄惁瀛樺湪
- List<BpmCategoryDO> categories = bpmCategoryService.getCategoryListByCode(
- Collections.singletonList(BPM_PROCESS_DEFINITION_CATEGORY_CODE));
- if (CollUtil.isEmpty(categories)) {
- throw exception(FINANCE_PAYMENT_BPM_CATEGORY_NOT_EXISTS);
+ private String getUserNickname(Long userId) {
+ if (userId == null) {
+ return null;
}
- }
-
- /**
- * 杞崲 BPM 瀹℃壒缁撴灉涓哄鏍哥姸鎬�
- */
- private Integer convertBpmResultToAuditStatus(Integer bpmResult) {
- if (BpmTaskStatusEnum.APPROVE.getStatus().equals(bpmResult)) {
- return ErpAuditStatus.APPROVE.getStatus();
- } else if (BpmTaskStatusEnum.REJECT.getStatus().equals(bpmResult)) {
- return ErpAuditStatus.PROCESS.getStatus();
- } else if (BpmTaskStatusEnum.CANCEL.getStatus().equals(bpmResult)) {
- return ErpAuditStatus.CANCEL.getStatus();
- }
- return null;
+ AdminUserRespDTO user = adminUserApi.getUser(userId);
+ return user == null ? null : user.getNickname();
}
private List<ErpFinancePaymentItemDO> validateFinancePaymentItems(
--
Gitblit v1.9.3