|
|
@ -1100,24 +1100,34 @@ public class BusinessOrderController {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
contractList.addAll(list);
|
|
|
|
contractList.addAll(list);
|
|
|
|
}else {
|
|
|
|
}else {
|
|
|
|
list = businessOrderService.querySaleContractInfo(businessOrderPagination.getBusinessLineId());
|
|
|
|
List<ContractLEntity> contractLEntityList = businessOrderService.querySaleContractInfo(businessOrderPagination.getBusinessLineId());
|
|
|
|
|
|
|
|
list = contractLEntityList.stream().filter(e -> e.getContractNumber().equals(businessOrderPagination.getContractNo())).collect(Collectors.toList());
|
|
|
|
for (ContractLEntity entity : list){
|
|
|
|
for (ContractLEntity entity : list){
|
|
|
|
List<String> productByContract = new ArrayList<>();
|
|
|
|
|
|
|
|
List<ProductByContractModel> productByContractModelList = businessOrderService.queryProductByContractInfo(entity.getId());
|
|
|
|
List<ProductByContractModel> productByContractModelList = businessOrderService.queryProductByContractInfo(entity.getId());
|
|
|
|
entity.setProductByContractModelList(productByContractModelList);
|
|
|
|
entity.setProductByContractModelList(productByContractModelList);
|
|
|
|
for (ProductByContractModel model : productByContractModelList){
|
|
|
|
|
|
|
|
productByContract.add(model.getProductId());
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
if(productByContract.containsAll(productIds)){
|
|
|
|
|
|
|
|
List<ContractLEntity> contract = list.stream().filter(e ->e.getId().equals(entity.getId())).collect(Collectors.toList());
|
|
|
|
|
|
|
|
contractList.addAll(contract);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
entity.setProductByContractModelList(productByContractModelList);
|
|
|
|
|
|
|
|
QueryWrapper<SubjectbasicEntity> subjectQueryWrapper = new QueryWrapper<>();
|
|
|
|
QueryWrapper<SubjectbasicEntity> subjectQueryWrapper = new QueryWrapper<>();
|
|
|
|
subjectQueryWrapper.lambda().eq(SubjectbasicEntity::getId,entity.getSubject());
|
|
|
|
subjectQueryWrapper.lambda().eq(SubjectbasicEntity::getId,entity.getSubject());
|
|
|
|
List<SubjectbasicEntity> subjectbasicEntityList = subjectbasicService.list(subjectQueryWrapper);
|
|
|
|
List<SubjectbasicEntity> subjectbasicEntityList = subjectbasicService.list(subjectQueryWrapper);
|
|
|
|
entity.setSubjectbasicEntityList(subjectbasicEntityList);
|
|
|
|
entity.setSubjectbasicEntityList(subjectbasicEntityList);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
contractList.addAll(list);
|
|
|
|
|
|
|
|
// for (ContractLEntity entity : list){
|
|
|
|
|
|
|
|
// List<String> productByContract = new ArrayList<>();
|
|
|
|
|
|
|
|
// List<ProductByContractModel> productByContractModelList = businessOrderService.queryProductByContractInfo(entity.getId());
|
|
|
|
|
|
|
|
// entity.setProductByContractModelList(productByContractModelList);
|
|
|
|
|
|
|
|
// for (ProductByContractModel model : productByContractModelList){
|
|
|
|
|
|
|
|
// productByContract.add(model.getProductId());
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
// if(productByContract.containsAll(productIds)){
|
|
|
|
|
|
|
|
// List<ContractLEntity> contract = list.stream().filter(e ->e.getId().equals(entity.getId())).collect(Collectors.toList());
|
|
|
|
|
|
|
|
// contractList.addAll(contract);
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
// entity.setProductByContractModelList(productByContractModelList);
|
|
|
|
|
|
|
|
// QueryWrapper<SubjectbasicEntity> subjectQueryWrapper = new QueryWrapper<>();
|
|
|
|
|
|
|
|
// subjectQueryWrapper.lambda().eq(SubjectbasicEntity::getId,entity.getSubject());
|
|
|
|
|
|
|
|
// List<SubjectbasicEntity> subjectbasicEntityList = subjectbasicService.list(subjectQueryWrapper);
|
|
|
|
|
|
|
|
// entity.setSubjectbasicEntityList(subjectbasicEntityList);
|
|
|
|
|
|
|
|
// }
|
|
|
|
}
|
|
|
|
}
|
|
|
|
PageListVO vo = new PageListVO();
|
|
|
|
PageListVO vo = new PageListVO();
|
|
|
|
vo.setList(contractList);
|
|
|
|
vo.setList(contractList);
|
|
|
|