|
@ -144,7 +144,7 @@ public class ProductionreturnRecordDetailController { |
|
|
Set<Long> masterIdSet = list.stream().map(ProductionreturnRecordDetailDO::getMasterId).collect(Collectors.toSet()); |
|
|
Set<Long> masterIdSet = list.stream().map(ProductionreturnRecordDetailDO::getMasterId).collect(Collectors.toSet()); |
|
|
List<ProductionreturnRecordMainDO> mainList = productionreturnRecordMainMapper.queryMainList(masterIdSet); |
|
|
List<ProductionreturnRecordMainDO> mainList = productionreturnRecordMainMapper.queryMainList(masterIdSet); |
|
|
Map<String, ProductionreturnRecordMainDO> mainMap = mainList.stream().collect(Collectors.toMap(ProductionreturnRecordMainDO::getNumber, e -> e)); |
|
|
Map<String, ProductionreturnRecordMainDO> mainMap = mainList.stream().collect(Collectors.toMap(ProductionreturnRecordMainDO::getNumber, e -> e)); |
|
|
//导出赋值
|
|
|
//导出赋值
|
|
|
datas.stream().iterator().forEachRemaining(vo -> { |
|
|
datas.stream().iterator().forEachRemaining(vo -> { |
|
|
vo.setCreator(Optional.ofNullable(userNicknameMap.get(vo.getCreator())).orElse("")); |
|
|
vo.setCreator(Optional.ofNullable(userNicknameMap.get(vo.getCreator())).orElse("")); |
|
|
vo.setJobNumber(Optional.ofNullable(mainMap.get(vo.getNumber())).map(ProductionreturnRecordMainDO::getJobNumber).orElse("")); |
|
|
vo.setJobNumber(Optional.ofNullable(mainMap.get(vo.getNumber())).map(ProductionreturnRecordMainDO::getJobNumber).orElse("")); |
|
|