From ee982b85c9ff09fbf6a6eb7c133b1e6f5fb160ba Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期五, 14 八月 2026 14:56:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business' into dev_business
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/MesProRouteProcessController.java | 55 ++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 40 insertions(+), 15 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/MesProRouteProcessController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/MesProRouteProcessController.java
index e02cb8a..1bc0813 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/MesProRouteProcessController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/MesProRouteProcessController.java
@@ -24,11 +24,7 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
import java.util.stream.Collectors;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@@ -150,21 +146,50 @@
list.forEach(item -> { if (item.getNextProcessId() != null) processIds.add(item.getNextProcessId()); });
Map<Long, MesProProcessDO> processMap = convertMap(
processService.getProcessList(new ArrayList<>(processIds)), MesProProcessDO::getId);
- // 2. 鎵归噺鑾峰彇浜у嚭浜у搧鐗╂枡淇℃伅
- Set<Long> outputItemIds = convertSet(list, MesProRouteProcessDO::getOutputItemId);
- outputItemIds.remove(null);
- Map<Long, MesMdItemDO> outputItemMap = outputItemIds.isEmpty()
- ? Collections.emptyMap()
- : mdItemService.getItemMap(outputItemIds);
+ // 2. 鎵归噺鑾峰彇浜у嚭浜у搧鐗╂枡淇℃伅锛堣В鏋愰�楀彿鍒嗛殧鐨勫瓧绗︿覆锛�
+ Set<Long> allOutputItemIds = new HashSet<>();
+ Map<Long, List<Long>> voOutputItemIdsMap = new HashMap<>();
+ for (int i = 0; i < list.size(); i++) {
+ String outputItemIdStr = list.get(i).getOutputItemId();
+ if (outputItemIdStr != null && !outputItemIdStr.isBlank()) {
+ List<Long> ids = Arrays.stream(outputItemIdStr.split(","))
+ .map(String::trim).filter(s -> !s.isEmpty())
+ .map(Long::valueOf).collect(Collectors.toList());
+ voOutputItemIdsMap.put((long) i, ids);
+ allOutputItemIds.addAll(ids);
+ }
+ }
+ Map<Long, MesMdItemDO> outputItemMap = allOutputItemIds.isEmpty()
+ ? Collections.emptyMap() : mdItemService.getItemMap(allOutputItemIds);
// 3. 鎷兼帴 VO
- return BeanUtils.toBean(list, MesProRouteProcessRespVO.class, vo -> {
+ List<MesProRouteProcessRespVO> result = BeanUtils.toBean(list, MesProRouteProcessRespVO.class);
+ for (int i = 0; i < result.size(); i++) {
+ MesProRouteProcessRespVO vo = result.get(i);
MapUtils.findAndThen(processMap, vo.getProcessId(),
process -> vo.setProcessCode(process.getCode()).setProcessName(process.getName()));
MapUtils.findAndThen(processMap, vo.getNextProcessId(),
nextProcess -> vo.setNextProcessName(nextProcess.getName()));
- MapUtils.findAndThen(outputItemMap, vo.getOutputItemId(),
- item -> vo.setOutputItemCode(item.getCode()).setOutputItemName(item.getName()));
- });
+ // 浜у嚭浜у搧锛堟敮鎸佸閫夛級
+ List<Long> ids = voOutputItemIdsMap.getOrDefault((long) i, Collections.emptyList());
+ if (!ids.isEmpty()) {
+ vo.setOutputItemIds(ids);
+ List<String> names = ids.stream()
+ .map(id -> {
+ MesMdItemDO item = outputItemMap.get(id);
+ return item != null ? item.getName() : String.valueOf(id);
+ }).collect(Collectors.toList());
+ vo.setOutputItemNames(String.join(", ", names));
+ // 鍚戝悗鍏煎锛氱涓�涓骇鍑轰骇鍝�
+ Long firstId = ids.get(0);
+ vo.setOutputItemId(firstId);
+ MesMdItemDO firstItem = outputItemMap.get(firstId);
+ if (firstItem != null) {
+ vo.setOutputItemCode(firstItem.getCode());
+ vo.setOutputItemName(firstItem.getName());
+ }
+ }
+ }
+ return result;
}
private MesProRouteProcessRespVO buildRouteProcessRespVO(MesProRouteProcessDO routeProcess) {
--
Gitblit v1.9.3