From bb0b80bd7ca7c1f979ab0125ae01f3faa1d14f4b Mon Sep 17 00:00:00 2001
From: hsy <1029150275@qq.com>
Date: 星期一, 17 八月 2026 09:37:57 +0800
Subject: [PATCH] Merge branch 'refs/heads/dev_business' into fix/hsy/20260811
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pd/project/MesPdProjectServiceImpl.java | 121 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 114 insertions(+), 7 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 12a637d..6648c60 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
@@ -1,6 +1,14 @@
package cn.iocoder.yudao.module.mes.service.pd.project;
+import cn.hutool.core.collection.CollUtil;
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.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.mes.controller.admin.pd.project.vo.MesPdProjectPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.pd.project.vo.MesPdProjectSaveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pd.document.MesPdDocumentDO;
@@ -16,18 +24,24 @@
import cn.iocoder.yudao.module.mes.service.pd.document.MesPdDocumentService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.flowable.engine.repository.ProcessDefinition;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import java.time.LocalDateTime;
+import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*;
/**
@@ -37,7 +51,13 @@
*/
@Service
@Validated
+@Slf4j
public class MesPdProjectServiceImpl implements MesPdProjectService {
+
+ /**
+ * BPM 浜у搧椤圭洰瀹℃壒鍒嗙被缂栫爜
+ */
+ private static final String BPM_PROCESS_DEFINITION_CATEGORY_CODE = "mes_pd_project_approve";
@Resource
private MesPdProjectMapper projectMapper;
@@ -55,6 +75,15 @@
@Resource
@Lazy
private MesMdAutoCodeRecordService autoCodeRecordService;
+
+ @Resource
+ private BpmProcessInstanceApi processInstanceApi;
+
+ @Resource
+ private BpmCategoryService bpmCategoryService;
+
+ @Resource
+ private BpmProcessDefinitionService bpmProcessDefinitionService;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -180,27 +209,105 @@
}
@Override
- public void auditProject(Long id) {
- // 鏍￠獙瀛樺湪
+ @Transactional(rollbackFor = Exception.class)
+ public void submitProjectApproval(Long id, String processDefinitionKey) {
+ // 1. 鏍￠獙瀛樺湪 + 寰呭鏍哥姸鎬�
MesPdProjectDO project = validateProjectExists(id);
- // 鏍￠獙鐘舵�佷负寰呭鏍�
if (!MesPdProjectStatusEnum.UPLOAD.getStatus().equals(project.getStatus())) {
- throw exception(PD_PROJECT_NOT_UPLOAD_FOR_AUDIT);
+ throw exception(PD_PROJECT_NOT_UPLOAD_FOR_APPROVAL);
}
- // 鏍￠獙璇ラ」鐩笅鎵�鏈夎祫鏂欏鏍歌褰曞潎宸插鏍革紙涓嶅瓨鍦ㄥ緟瀹℃牳鐨勮褰曪級
+ // 2. 鏍￠獙璇ラ」鐩笅鎵�鏈夎祫鏂欏鏍歌褰曞潎宸插鏍革紙涓嶅瓨鍦ㄥ緟瀹℃牳鐨勮褰曪級
List<MesPdDocumentDO> documents = documentService.getDocumentListByProjectId(id);
List<Long> documentIds = documents.stream().map(MesPdDocumentDO::getId).toList();
if (documentAuditMapper.existsPendingAuditByDocumentIds(documentIds)) {
throw exception(PD_PROJECT_AUDIT_NOT_FINISHED);
}
- // 鏇存柊鐘舵��
+ // 3. 鍒涘缓 BPM 娴佺▼瀹炰緥
+ String processInstanceId = processInstanceApi.createProcessInstance(getLoginUserId(),
+ new BpmProcessInstanceCreateReqDTO()
+ .setProcessDefinitionKey(processDefinitionKey)
+ .setBusinessKey(String.valueOf(id)));
+ // 4. 鏇存柊椤圭洰鐘舵�佷负瀹℃壒涓�
projectMapper.updateById(MesPdProjectDO.builder()
.id(id)
- .status(MesPdProjectStatusEnum.AUDIT.getStatus())
+ .status(MesPdProjectStatusEnum.APPROVING.getStatus())
+ .processInstanceId(processInstanceId)
+ .processDefinitionKey(processDefinitionKey)
.build());
}
@Override
+ public List<Map<String, Object>> getProjectApproveProcessDefinitionList() {
+ // 1. 鏍￠獙鍒嗙被鏄惁瀛樺湪
+ List<BpmCategoryDO> categories = bpmCategoryService.getCategoryListByCode(
+ Collections.singletonList(BPM_PROCESS_DEFINITION_CATEGORY_CODE));
+ if (CollUtil.isEmpty(categories)) {
+ throw exception(PD_PROJECT_BPM_CATEGORY_NOT_EXISTS);
+ }
+ // 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;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void updateProjectAuditStatus(Long id, Integer bpmResult) {
+ // 1. 鏍￠獙瀛樺湪
+ MesPdProjectDO project = validateProjectExists(id);
+ if (!MesPdProjectStatusEnum.APPROVING.getStatus().equals(project.getStatus())) {
+ log.warn("[updateProjectAuditStatus] 璁捐椤圭洰({}) 涓嶅浜庡鎵逛腑鐘舵�侊紝褰撳墠鐘舵�侊細{}", id, project.getStatus());
+ return;
+ }
+ // 2. 鏍规嵁瀹℃壒缁撴灉鏇存柊鐘舵��
+ Integer newStatus = convertBpmResultToProjectStatus(bpmResult);
+ if (newStatus != null) {
+ projectMapper.updateById(MesPdProjectDO.builder()
+ .id(id)
+ .status(newStatus)
+ .build());
+ }
+ }
+
+ /**
+ * 杞崲 BPM 瀹℃壒缁撴灉涓鸿璁￠」鐩姸鎬�
+ */
+ private Integer convertBpmResultToProjectStatus(Integer bpmResult) {
+ if (BpmTaskStatusEnum.APPROVE.getStatus().equals(bpmResult)) {
+ return MesPdProjectStatusEnum.AUDIT.getStatus();
+ } else if (BpmTaskStatusEnum.REJECT.getStatus().equals(bpmResult)) {
+ return MesPdProjectStatusEnum.UPLOAD.getStatus();
+ } else if (BpmTaskStatusEnum.CANCEL.getStatus().equals(bpmResult)) {
+ return MesPdProjectStatusEnum.UPLOAD.getStatus();
+ }
+ return null;
+ }
+
+ @Override
@Transactional(rollbackFor = Exception.class)
public void archiveProject(Long id, Long userId) {
// 鏍￠獙瀛樺湪
--
Gitblit v1.9.3