From 7a681887e5a8e1aab49acc886974d354c69a280e Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 17 九月 2026 13:10:38 +0800
Subject: [PATCH] feat(mes): 新增质检指标分组树和平行测量功能
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/MesQcIqcController.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/MesQcIqcController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/MesQcIqcController.java
index e535b20..b63e2e6 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/MesQcIqcController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/MesQcIqcController.java
@@ -160,9 +160,12 @@
// 鎵归噺鏌ヨ璁￠噺鍗曚綅锛堥�氳繃鐗╂枡鐨� unitMeasureId锛�
Map<Long, MesMdUnitMeasureDO> unitMeasureMap = unitMeasureService.getUnitMeasureMap(
convertSet(itemMap.values(), MesMdItemDO::getUnitMeasureId));
- // 鎵归噺鏌ヨ妫�娴嬩汉鍛�
- Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(
- convertSet(list, MesQcIqcDO::getInspectorUserId));
+ // 鎵归噺鏌ヨ妫�娴�/澶嶆牳/瀹℃牳浜哄憳
+ Set<Long> qcUserIds = new HashSet<>();
+ qcUserIds.addAll(convertSet(list, MesQcIqcDO::getInspectorUserId));
+ qcUserIds.addAll(convertSet(list, MesQcIqcDO::getAuditUserId));
+ qcUserIds.addAll(convertSet(list, MesQcIqcDO::getApproveUserId));
+ Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(qcUserIds);
// 鎵归噺鏌ヨ妫�楠岄」鎸囨爣
Set<Long> qcIds = convertSet(list, MesQcIqcDO::getId);
Map<Long, List<MesQcIndicatorResultDO>> indicatorResultMap = new HashMap<>();
@@ -233,6 +236,10 @@
});
findAndThen(userMap, vo.getInspectorUserId(),
user -> vo.setInspectorNickname(user.getNickname()));
+ findAndThen(userMap, vo.getAuditUserId(),
+ user -> vo.setAuditNickname(user.getNickname()));
+ findAndThen(userMap, vo.getApproveUserId(),
+ user -> vo.setApproveNickname(user.getNickname()));
// 璁剧疆妫�楠岄」鎸囨爣姹囨��
vo.setIndicatorResultSummary(indicatorSummaryMap.getOrDefault(vo.getId(), ""));
});
--
Gitblit v1.9.3