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