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 | 180 +++++++++++++++++++++++++++++------------------------------
1 files changed, 89 insertions(+), 91 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 408d6d6..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
@@ -2,15 +2,12 @@
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;
@@ -20,15 +17,15 @@
import cn.iocoder.yudao.module.erp.dal.mysql.finance.ErpFinancePaymentMapper;
import cn.iocoder.yudao.module.erp.dal.redis.no.ErpNoRedisDAO;
import cn.iocoder.yudao.module.erp.enums.ErpAuditStatus;
-import cn.iocoder.yudao.module.erp.enums.ErpPurchaseInvoiceAuditStatusEnum;
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;
@@ -38,6 +35,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.*;
/**
@@ -51,9 +49,14 @@
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";
+
+ /**
+ * 浠樻鍗曞鎵圭殑 BPM 娴佺▼瀹氫箟 Key
+ */
+ private static final String FINANCE_PAYMENT_PROCESS_KEY = "erp-finance-payment-audit";
@Resource
private ErpFinancePaymentMapper financePaymentMapper;
@@ -77,11 +80,10 @@
private StorageAttachmentApi storageAttachmentApi;
@Resource
- private BpmProcessInstanceApi processInstanceApi;
+ private ApprovalConfigApi approvalConfigApi;
+
@Resource
- private BpmCategoryService bpmCategoryService;
- @Resource
- private BpmProcessDefinitionService bpmProcessDefinitionService;
+ private BpmProcessInstanceApi bpmProcessInstanceApi;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -177,105 +179,105 @@
@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,
+ // 2. 鏍￠獙瀹℃壒閰嶇疆宸插惎鐢ㄤ笖閰嶇疆浜嗘湁鏁堝鎵逛汉
+ approvalConfigApi.validateApprovalEnabledAndGetApprovers(FINANCE_PAYMENT_APPROVE_BIZ_TYPE);
+ // 3. 鐘舵�佺疆涓哄鎵逛腑锛屽苟娓呯┖涓婁竴杞鏍哥粨鏋�
+ if (financePaymentMapper.submitAndResetAuditInfo(id, ErpAuditStatus.APPROVING.getStatus()) != 1) {
+ throw exception(FINANCE_PAYMENT_SUBMIT_FAIL_NOT_ALLOWED);
+ }
+ // 4. 鍒涘缓 BPM 娴佺▼瀹炰緥锛屼娇瀹℃壒鍑虹幇鍦ㄣ�屽崗鍚屽姙鍏� - 鎴戠殑娴佺▼銆�
+ bpmProcessInstanceApi.createProcessInstance(getLoginUserId(),
new BpmProcessInstanceCreateReqDTO()
- .setProcessDefinitionKey(processDefinitionKey)
+ .setProcessDefinitionKey(FINANCE_PAYMENT_PROCESS_KEY)
.setBusinessKey(String.valueOf(id)));
-
- // 3. 鏇存柊浠樻鍗曠姸鎬佷负瀹℃壒涓�
- financePaymentMapper.updateById(new ErpFinancePaymentDO()
- .setId(id)
- .setStatus(ErpAuditStatus.APPROVING.getStatus())
- .setProcessInstanceId(processInstanceId));
}
@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);
+ }
+ if (financePaymentMapper.auditFinancePayment(id, ErpAuditStatus.PROCESS.getStatus(),
+ userId, getUserNickname(userId), reviewRemark) != 1) {
+ throw exception(FINANCE_PAYMENT_AUDIT_FAIL_NOT_PROCESS);
+ }
return;
}
+ // 5. 瀹℃牳閫氳繃锛氳褰曞鏍镐汉涓庡鏍告剰瑙侊紝鐘舵�佺疆涓哄凡瀹℃牳
+ if (financePaymentMapper.auditFinancePayment(id, ErpAuditStatus.APPROVE.getStatus(),
+ userId, getUserNickname(userId), reviewRemark) != 1) {
+ throw exception(FINANCE_PAYMENT_AUDIT_FAIL_NOT_PROCESS);
+ }
+ }
- // 2. 鏍规嵁瀹℃壒缁撴灉鏇存柊鐘舵��
- Integer newStatus = convertBpmResultToAuditStatus(bpmResult);
- if (newStatus != null) {
- financePaymentMapper.updateById(new ErpFinancePaymentDO()
- .setId(id).setStatus(newStatus));
+ @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 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);
- }
- }
-
- /**
- * 杞崲 BPM 瀹℃壒缁撴灉涓哄鏍哥姸鎬�
- */
- private Integer convertBpmResultToAuditStatus(Integer bpmResult) {
- if (BpmTaskStatusEnum.APPROVE.getStatus().equals(bpmResult)) {
+ private Integer convertBpmResultToStatus(Integer bpmStatus) {
+ if (BpmTaskStatusEnum.APPROVE.getStatus().equals(bpmStatus)) {
return ErpAuditStatus.APPROVE.getStatus();
- } else if (BpmTaskStatusEnum.REJECT.getStatus().equals(bpmResult)) {
+ }
+ if (BpmTaskStatusEnum.REJECT.getStatus().equals(bpmStatus)) {
return ErpAuditStatus.PROCESS.getStatus();
- } else if (BpmTaskStatusEnum.CANCEL.getStatus().equals(bpmResult)) {
- return ErpAuditStatus.CANCEL.getStatus();
+ }
+ if (BpmTaskStatusEnum.CANCEL.getStatus().equals(bpmStatus)) {
+ return ErpAuditStatus.PROCESS.getStatus();
}
return null;
+ }
+
+ /**
+ * 鑾峰彇鐢ㄦ埛鏄电О
+ *
+ * @param userId 鐢ㄦ埛缂栧彿
+ * @return 鏄电О锛岀敤鎴蜂笉瀛樺湪鏃惰繑鍥� null
+ */
+ private String getUserNickname(Long userId) {
+ if (userId == null) {
+ return null;
+ }
+ AdminUserRespDTO user = adminUserApi.getUser(userId);
+ return user == null ? null : user.getNickname();
}
private List<ErpFinancePaymentItemDO> validateFinancePaymentItems(
@@ -354,7 +356,7 @@
}
/**
- * 鏍￠獙浠樻鍗曞叧鑱旂殑鏉ョエ锛氬瓨鍦ㄣ�佸鎵归�氳繃銆佸凡涓婁紶鍙戠エ闄勪欢銆佷緵搴斿晢涓庢潵绁ㄤ竴鑷�
+ * 鏍￠獙浠樻鍗曞叧鑱旂殑鏉ョエ锛氬瓨鍦ㄣ�佸凡涓婁紶鍙戠エ闄勪欢銆佷緵搴斿晢涓庢潵绁ㄤ竴鑷�
*
* @param invoiceId 鏉ョエ缂栧彿
* @param supplierId 渚涘簲鍟嗙紪鍙�
@@ -365,16 +367,12 @@
if (invoice == null) {
throw exception(FINANCE_PAYMENT_CREATE_FAIL_INVOICE_NOT_EXISTS);
}
- // 2. 鏍￠獙鏉ョエ瀹℃壒閫氳繃
- if (ObjectUtil.notEqual(invoice.getAuditStatus(), ErpPurchaseInvoiceAuditStatusEnum.APPROVE.getStatus())) {
- throw exception(FINANCE_PAYMENT_CREATE_FAIL_INVOICE_NOT_APPROVE);
- }
- // 3. 鏍￠獙宸蹭笂浼犲彂绁ㄩ檮浠�
+ // 2. 鏍￠獙宸蹭笂浼犲彂绁ㄩ檮浠�
if (CollUtil.isEmpty(storageAttachmentApi.listAttachments(
ErpPurchaseInvoiceServiceImpl.PURCHASE_INVOICE_RECORD_TYPE, invoiceId))) {
throw exception(FINANCE_PAYMENT_CREATE_FAIL_INVOICE_NOT_ATTACHMENT);
}
- // 4. 鏍￠獙渚涘簲鍟嗕笌鏉ョエ涓�鑷达紙闃茶剰鏁版嵁锛�
+ // 3. 鏍￠獙渚涘簲鍟嗕笌鏉ョエ涓�鑷达紙闃茶剰鏁版嵁锛�
if (ObjectUtil.notEqual(invoice.getSupplierId(), supplierId)) {
throw exception(FINANCE_PAYMENT_CREATE_FAIL_INVOICE_SUPPLIER_MISMATCH);
}
--
Gitblit v1.9.3