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-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pd/project/MesPdProjectServiceImpl.java | 38 ++++++++++++++++++++++++++++++++++++++
1 files changed, 38 insertions(+), 0 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pd/project/MesPdProjectServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pd/project/MesPdProjectServiceImpl.java
index cf282cf..1e798a7 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pd/project/MesPdProjectServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pd/project/MesPdProjectServiceImpl.java
@@ -4,6 +4,9 @@
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
+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.pd.project.vo.MesPdProjectImportExcelVO;
import cn.iocoder.yudao.module.mes.controller.admin.pd.project.vo.MesPdProjectImportRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.pd.project.vo.MesPdProjectPageReqVO;
@@ -61,8 +64,16 @@
*/
private static final String PROJECT_APPROVE_BIZ_TYPE = "mes_pd_project_approve";
+ /**
+ * 璁捐椤圭洰瀹℃壒鐨� BPM 娴佺▼瀹氫箟 Key
+ */
+ private static final String PROJECT_APPROVE_PROCESS_KEY = "mes-pd-project-audit";
+
@Resource
private MesPdProjectMapper projectMapper;
+
+ @Resource
+ private BpmProcessInstanceApi bpmProcessInstanceApi;
@Resource
@Lazy
@@ -217,6 +228,9 @@
}
// 2. 鏍￠獙璇ラ」鐩笅鎵�鏈夎祫鏂欏鏍歌褰曞潎宸插鏍革紙涓嶅瓨鍦ㄥ緟瀹℃牳鐨勮褰曪級
List<MesPdDocumentDO> documents = documentService.getDocumentListByProjectId(id);
+ if (CollUtil.isEmpty(documents)) {
+ throw exception(PD_PROJECT_NO_DOCUMENT);
+ }
List<Long> documentIds = documents.stream().map(MesPdDocumentDO::getId).toList();
if (documentAuditMapper.existsPendingAuditByDocumentIds(documentIds)) {
throw exception(PD_PROJECT_AUDIT_NOT_FINISHED);
@@ -225,6 +239,30 @@
approvalConfigApi.validateApprovalEnabledAndGetApprovers(PROJECT_APPROVE_BIZ_TYPE);
// 4. 鐘舵�佺疆涓哄鎵逛腑锛屽苟娓呯┖涓婁竴杞鏍哥粨鏋�
projectMapper.submitAndResetAuditInfo(id, MesPdProjectStatusEnum.APPROVING.getStatus());
+ // 5. 鍒涘缓 BPM 娴佺▼瀹炰緥锛屼娇瀹℃壒鍑虹幇鍦ㄣ�屽崗鍚屽姙鍏� - 鎴戠殑娴佺▼銆�
+ bpmProcessInstanceApi.createProcessInstance(getLoginUserId(),
+ new BpmProcessInstanceCreateReqDTO()
+ .setProcessDefinitionKey(PROJECT_APPROVE_PROCESS_KEY)
+ .setBusinessKey(String.valueOf(id)));
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void updateProjectAuditStatus(Long id, Integer bpmStatus, String reason) {
+ // BPM 瀹℃壒缁撴灉鏄犲皠涓洪」鐩姸鎬侊細閫氳繃=寰呭綊妗� / 涓嶉�氳繃=寰呭鏍革紙鍙慨鏀瑰悗閲嶆柊鎻愪氦锛�
+ Integer status;
+ if (BpmTaskStatusEnum.APPROVE.getStatus().equals(bpmStatus)) {
+ status = MesPdProjectStatusEnum.AUDIT.getStatus();
+ } else if (BpmTaskStatusEnum.REJECT.getStatus().equals(bpmStatus)) {
+ status = MesPdProjectStatusEnum.UPLOAD.getStatus();
+ } else {
+ // 璁捐椤圭洰娌℃湁銆屽凡鍙栨秷銆嶇姸鎬侊紝鍏朵綑 BPM 缁撴灉锛堝鎾ゆ秷锛夊拷鐣�
+ log.warn("[updateProjectAuditStatus] 蹇界暐涓嶆敮鎸佺殑 BPM 鐘舵��({})锛宲rojectId={}", bpmStatus, id);
+ return;
+ }
+ if (projectMapper.updateAuditStatusByBpm(id, status, reason) != 1) {
+ log.warn("[updateProjectAuditStatus] 璁捐椤圭洰({}) 涓嶅浜庡鎵逛腑鐘舵�侊紝蹇界暐 BPM 缁撴灉({})", id, bpmStatus);
+ }
}
@Override
--
Gitblit v1.9.3