From 3990ae574c221e3764ce9cbc2e4e3eb71b7b1b52 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期六, 24 十月 2026 23:41:23 +0800
Subject: [PATCH] fix(mes): 修复批次正反向追溯链路
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pd/project/MesPdProjectServiceImpl.java | 245 +++++++++++++++++++++++++++++++-----------------
1 files changed, 159 insertions(+), 86 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 6648c60..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
@@ -1,14 +1,14 @@
package cn.iocoder.yudao.module.mes.service.pd.project;
import cn.hutool.core.collection.CollUtil;
+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.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.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;
import cn.iocoder.yudao.module.mes.controller.admin.pd.project.vo.MesPdProjectSaveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pd.document.MesPdDocumentDO;
@@ -22,10 +22,12 @@
import cn.iocoder.yudao.module.mes.enums.pd.MesPdProjectStatusEnum;
import cn.iocoder.yudao.module.mes.service.md.autocode.MesMdAutoCodeRecordService;
import cn.iocoder.yudao.module.mes.service.pd.document.MesPdDocumentService;
+import cn.iocoder.yudao.module.system.api.approval.ApprovalConfigApi;
+import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
+import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
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;
@@ -34,10 +36,11 @@
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap;
@@ -55,12 +58,22 @@
public class MesPdProjectServiceImpl implements MesPdProjectService {
/**
- * BPM 浜у搧椤圭洰瀹℃壒鍒嗙被缂栫爜
+ * 璁捐椤圭洰瀹℃壒鐨勪笟鍔＄被鍨嬬紪鐮�
+ *
+ * 涓� system_approval_config.biz_type 瀵瑰簲锛屽鏍镐汉鍦ㄣ�岀郴缁熺鐞� - 瀹℃壒閰嶇疆銆嶄腑缁存姢銆�
*/
- private static final String BPM_PROCESS_DEFINITION_CATEGORY_CODE = "mes_pd_project_approve";
+ 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
@@ -77,13 +90,10 @@
private MesMdAutoCodeRecordService autoCodeRecordService;
@Resource
- private BpmProcessInstanceApi processInstanceApi;
+ private AdminUserApi adminUserApi;
@Resource
- private BpmCategoryService bpmCategoryService;
-
- @Resource
- private BpmProcessDefinitionService bpmProcessDefinitionService;
+ private ApprovalConfigApi approvalConfigApi;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -210,7 +220,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void submitProjectApproval(Long id, String processDefinitionKey) {
+ public void submitProjectApproval(Long id) {
// 1. 鏍￠獙瀛樺湪 + 寰呭鏍哥姸鎬�
MesPdProjectDO project = validateProjectExists(id);
if (!MesPdProjectStatusEnum.UPLOAD.getStatus().equals(project.getStatus())) {
@@ -218,93 +228,86 @@
}
// 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);
}
- // 3. 鍒涘缓 BPM 娴佺▼瀹炰緥
- String processInstanceId = processInstanceApi.createProcessInstance(getLoginUserId(),
+ // 3. 鏍￠獙瀹℃壒閰嶇疆宸插惎鐢ㄤ笖閰嶇疆浜嗘湁鏁堝鏍镐汉锛堟湭閰嶇疆鏃舵姏鍑哄甫鏄庣‘鎻愮ず鐨勪笟鍔″紓甯革級
+ approvalConfigApi.validateApprovalEnabledAndGetApprovers(PROJECT_APPROVE_BIZ_TYPE);
+ // 4. 鐘舵�佺疆涓哄鎵逛腑锛屽苟娓呯┖涓婁竴杞鏍哥粨鏋�
+ projectMapper.submitAndResetAuditInfo(id, MesPdProjectStatusEnum.APPROVING.getStatus());
+ // 5. 鍒涘缓 BPM 娴佺▼瀹炰緥锛屼娇瀹℃壒鍑虹幇鍦ㄣ�屽崗鍚屽姙鍏� - 鎴戠殑娴佺▼銆�
+ bpmProcessInstanceApi.createProcessInstance(getLoginUserId(),
new BpmProcessInstanceCreateReqDTO()
- .setProcessDefinitionKey(processDefinitionKey)
+ .setProcessDefinitionKey(PROJECT_APPROVE_PROCESS_KEY)
.setBusinessKey(String.valueOf(id)));
- // 4. 鏇存柊椤圭洰鐘舵�佷负瀹℃壒涓�
- projectMapper.updateById(MesPdProjectDO.builder()
- .id(id)
- .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());
+ 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;
}
- // 2. 鏍规嵁瀹℃壒缁撴灉鏇存柊鐘舵��
- Integer newStatus = convertBpmResultToProjectStatus(bpmResult);
- if (newStatus != null) {
- projectMapper.updateById(MesPdProjectDO.builder()
- .id(id)
- .status(newStatus)
- .build());
+ if (projectMapper.updateAuditStatusByBpm(id, status, reason) != 1) {
+ log.warn("[updateProjectAuditStatus] 璁捐椤圭洰({}) 涓嶅浜庡鎵逛腑鐘舵�侊紝蹇界暐 BPM 缁撴灉({})", id, bpmStatus);
}
}
- /**
- * 杞崲 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();
+ @Override
+ public Set<Long> getProjectApproverUserIds() {
+ return approvalConfigApi.getApproverUserIds(PROJECT_APPROVE_BIZ_TYPE);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void auditProject(Long id, Boolean pass, String reviewRemark) {
+ // 1. 鏍￠獙瀛樺湪
+ MesPdProjectDO project = validateProjectExists(id);
+ // 2. 鏍￠獙澶勪簬瀹℃壒涓姸鎬�
+ if (!MesPdProjectStatusEnum.APPROVING.getStatus().equals(project.getStatus())) {
+ throw exception(PD_PROJECT_NOT_APPROVING);
}
- return null;
+ // 3. 鏍￠獙褰撳墠鐧诲綍鐢ㄦ埛鏄涓氬姟绫诲瀷鐨勫鏍镐汉锛堟垨绛撅細浠讳竴浜哄潎鍙鏍革級
+ Long userId = getLoginUserId();
+ approvalConfigApi.validateApprover(PROJECT_APPROVE_BIZ_TYPE, userId);
+ // 4. 瀹℃牳涓嶉�氳繃锛氬繀椤诲～鍐欏師鍥狅紝閫�鍥炲緟瀹℃牳鐘舵�侊紝鍙慨鏀瑰悗閲嶆柊鎻愪氦
+ if (!Boolean.TRUE.equals(pass)) {
+ if (StrUtil.isBlank(reviewRemark)) {
+ throw exception(PD_PROJECT_AUDIT_REJECT_REASON_REQUIRED);
+ }
+ projectMapper.auditProject(id, MesPdProjectStatusEnum.UPLOAD.getStatus(),
+ userId, getUserNickname(userId), reviewRemark);
+ return;
+ }
+ // 5. 瀹℃牳閫氳繃锛氳褰曞鏍镐汉涓庡鏍告剰瑙侊紝鐘舵�佺疆涓哄緟褰掓。
+ projectMapper.auditProject(id, MesPdProjectStatusEnum.AUDIT.getStatus(),
+ userId, getUserNickname(userId), reviewRemark);
+ }
+
+ /**
+ * 鑾峰彇鐢ㄦ埛鏄电О
+ *
+ * @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();
}
@Override
@@ -364,6 +367,76 @@
}
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public MesPdProjectImportRespVO importProjectList(List<MesPdProjectImportExcelVO> importList,
+ boolean updateSupport) {
+ // 1. 鏍￠獙闈炵┖
+ if (CollUtil.isEmpty(importList)) {
+ throw exception(PD_PROJECT_IMPORT_LIST_IS_EMPTY);
+ }
+
+ // 2. 閫愯澶勭悊
+ MesPdProjectImportRespVO respVO = MesPdProjectImportRespVO.builder()
+ .createCodes(new ArrayList<>()).updateCodes(new ArrayList<>())
+ .failureCodes(new LinkedHashMap<>()).build();
+ AtomicInteger index = new AtomicInteger(1);
+ importList.forEach(importItem -> {
+ int currentIndex = index.getAndIncrement();
+ String key = StrUtil.blankToDefault(importItem.getTaskCode(), "绗� " + currentIndex + " 琛�");
+ if (StrUtil.isBlank(importItem.getTaskCode())) {
+ respVO.getFailureCodes().put(key, "浠诲姟缂栫爜涓嶈兘涓虹┖");
+ return;
+ }
+ if (StrUtil.isBlank(importItem.getTaskName())) {
+ respVO.getFailureCodes().put(key, "浠诲姟鍚嶇О涓嶈兘涓虹┖");
+ return;
+ }
+ // 2.1 鍒ゆ柇锛氬垱寤� or 鏇存柊
+ MesPdProjectDO existProject = projectMapper.selectByTaskCode(importItem.getTaskCode());
+ if (existProject == null) {
+ // 2.1.1 鏂板锛堝鐢� create 鐨勭姸鎬佸垵濮嬪寲閫昏緫锛�
+ MesPdProjectDO project = MesPdProjectDO.builder()
+ .taskCode(importItem.getTaskCode())
+ .taskName(importItem.getTaskName())
+ .productCode(importItem.getProductCode())
+ .productName(importItem.getProductName())
+ .version(importItem.getVersion())
+ .status(MesPdProjectStatusEnum.INITIATE.getStatus())
+ .chiefDesigner(importItem.getChiefDesigner())
+ .reviewer(importItem.getReviewer())
+ .planFinishTime(importItem.getPlanFinishTime())
+ .remark(importItem.getRemark())
+ .build();
+ projectMapper.insert(project);
+ respVO.getCreateCodes().add(importItem.getTaskCode());
+ } else if (updateSupport) {
+ // 2.1.2 鏇存柊锛堜粎寰呭彂甯冪姸鎬佸彲鏇存柊锛�
+ if (ObjUtil.notEqual(MesPdProjectStatusEnum.INITIATE.getStatus(), existProject.getStatus())) {
+ respVO.getFailureCodes().put(key, "浠呭緟鍙戝竷鐘舵�佺殑璁捐椤圭洰鍙洿鏂�");
+ return;
+ }
+ MesPdProjectDO updateObj = MesPdProjectDO.builder()
+ .id(existProject.getId())
+ .taskCode(importItem.getTaskCode())
+ .taskName(importItem.getTaskName())
+ .productCode(importItem.getProductCode())
+ .productName(importItem.getProductName())
+ .version(importItem.getVersion())
+ .chiefDesigner(importItem.getChiefDesigner())
+ .reviewer(importItem.getReviewer())
+ .planFinishTime(importItem.getPlanFinishTime())
+ .remark(importItem.getRemark())
+ .build();
+ projectMapper.updateById(updateObj);
+ respVO.getUpdateCodes().add(importItem.getTaskCode());
+ } else {
+ respVO.getFailureCodes().put(key, "浠诲姟缂栫爜宸插瓨鍦�");
+ }
+ });
+ return respVO;
+ }
+
/**
* 鐢熸垚瀹℃牳鍗曞彿锛堜娇鐢ㄧ紪鐮佽鍒欙級
*/
--
Gitblit v1.9.3