|
@@ -372,10 +372,10 @@ public class SalesContractServiceImpl extends ServiceImpl<SalesContractMapper, S
|
|
List<Long> scdIds = salesContractDetailsVos.stream().map(SalesContractDetails::getId).collect(Collectors.toList());
|
|
List<Long> scdIds = salesContractDetailsVos.stream().map(SalesContractDetails::getId).collect(Collectors.toList());
|
|
List<ProductionTaskDetail> productionTaskDetailList = productionTaskDetailService.list(q -> q.in(ProductionTaskDetail::getContractDetailsId, scdIds));
|
|
List<ProductionTaskDetail> productionTaskDetailList = productionTaskDetailService.list(q -> q.in(ProductionTaskDetail::getContractDetailsId, scdIds));
|
|
List<ProductionTaskDetailVo> productionTaskDetailVos = BeanUtil.copyToList(productionTaskDetailList, ProductionTaskDetailVo.class);
|
|
List<ProductionTaskDetailVo> productionTaskDetailVos = BeanUtil.copyToList(productionTaskDetailList, ProductionTaskDetailVo.class);
|
|
- Map<Long, List<ProductionTaskDetailVo>> salesDeliveryMap = productionTaskDetailVos.stream().collect(Collectors.groupingBy(ProductionTaskDetailVo::getProductId));
|
|
|
|
|
|
+ Map<Long, List<ProductionTaskDetailVo>> salesDeliveryMap = productionTaskDetailVos.stream().collect(Collectors.groupingBy(ProductionTaskDetailVo::getContractDetailsId));
|
|
|
|
|
|
for (SalesContractDetailsVo salesContractDetailsVo : salesContractDetailsVos) {
|
|
for (SalesContractDetailsVo salesContractDetailsVo : salesContractDetailsVos) {
|
|
- List<ProductionTaskDetailVo> list = salesDeliveryMap.get(salesContractDetailsVo.getProductId());
|
|
|
|
|
|
+ List<ProductionTaskDetailVo> list = salesDeliveryMap.get(salesContractDetailsVo.getId());
|
|
salesContractDetailsVo.setProductionTaskDetailList(list);
|
|
salesContractDetailsVo.setProductionTaskDetailList(list);
|
|
}
|
|
}
|
|
|
|
|