fix:新增换线记录操作人

main
HuangHuiKang 1 day ago
parent 815f405cfa
commit 89a8fba7fd

@ -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;

@ -1066,6 +1066,11 @@ public class PlanServiceImpl implements PlanService {
List<PlanLineChangeRecordBatchRespVO> batchList = batchMap.entrySet().stream()
.map(entry -> buildLineChangeBatchRespVO(entry.getKey(), entry.getValue()))
.collect(Collectors.toList());
Map<Long, AdminUserDO> 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());

Loading…
Cancel
Save