diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/plan/vo/PlanLineChangeRecordBatchRespVO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/plan/vo/PlanLineChangeRecordBatchRespVO.java index db598c937..9966b5517 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/plan/vo/PlanLineChangeRecordBatchRespVO.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/plan/vo/PlanLineChangeRecordBatchRespVO.java @@ -22,6 +22,9 @@ public class PlanLineChangeRecordBatchRespVO { @Schema(description = "操作人 ID", example = "1") private Long operatorUserId; + @Schema(description = "操作人名字", example = "张三") + private String operatorUserName; + @Schema(description = "当前计划合格数量", example = "100") private Long passNumber; diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/plan/PlanServiceImpl.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/plan/PlanServiceImpl.java index e7d971f13..e0d67aae2 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/plan/PlanServiceImpl.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/plan/PlanServiceImpl.java @@ -1066,6 +1066,11 @@ public class PlanServiceImpl implements PlanService { List batchList = batchMap.entrySet().stream() .map(entry -> buildLineChangeBatchRespVO(entry.getKey(), entry.getValue())) .collect(Collectors.toList()); + Map operatorUserMap = userService.getUserMap( + batchList.stream().map(PlanLineChangeRecordBatchRespVO::getOperatorUserId) + .filter(Objects::nonNull).collect(Collectors.toSet())); + batchList.forEach(batch -> MapUtils.findAndThen(operatorUserMap, batch.getOperatorUserId(), + user -> batch.setOperatorUserName(user.getNickname()))); int fromIndex = Math.min((pageReqVO.getPageNo() - 1) * pageReqVO.getPageSize(), batchList.size()); int toIndex = Math.min(fromIndex + pageReqVO.getPageSize(), batchList.size()); return new PageResult<>(batchList.subList(fromIndex, toIndex), (long) batchList.size());