|
|
@ -97,15 +97,15 @@ public class ReportBillLoadingAsyncService implements IReportBillLoadingAsyncSer |
|
|
|
userIds.add(detailsVO.getExamineUser()); |
|
|
|
userIds.add(detailsVO.getExamineUser()); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
// R<List<User>> listR = userClient.userInfoByIds(AuthUtil.getTenantId(), CollUtil.join(userIds, ","));
|
|
|
|
R<List<User>> listR = userClient.userInfoByIds(AuthUtil.getTenantId(), CollUtil.join(userIds, ",")); |
|
|
|
// if (ObjectUtil.equal(ReportConstants.HTTP_SUCCESS_CODE, listR.getCode())) {
|
|
|
|
if (ObjectUtil.equal(ReportConstants.HTTP_SUCCESS_CODE, listR.getCode())) { |
|
|
|
// List<User> data = listR.getData();
|
|
|
|
List<User> data = listR.getData(); |
|
|
|
// Map<Long, String> collect = data.stream().collect(Collectors.toMap(User::getId, User::getName));
|
|
|
|
Map<Long, String> collect = data.stream().collect(Collectors.toMap(User::getId, User::getName)); |
|
|
|
// for (BillLoadingDetailsVO detailsVO : detailsPage) {
|
|
|
|
for (BillLoadingDetailsVO detailsVO : detailsPage) { |
|
|
|
// detailsVO.setScanUser(collect.get(detailsVO.getScanUser()));
|
|
|
|
detailsVO.setScanUser(collect.get(detailsVO.getScanUser())); |
|
|
|
// detailsVO.setExamineUser(collect.get(detailsVO.getExamineUser()));
|
|
|
|
detailsVO.setExamineUser(collect.get(detailsVO.getExamineUser())); |
|
|
|
// }
|
|
|
|
} |
|
|
|
// }
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
return page.setRecords(detailsPage); |
|
|
|
return page.setRecords(detailsPage); |
|
|
|