|
@@ -1816,7 +1816,12 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
|
|
contract.setAmount(contractService.getOne(queryWrapper).getAmount());
|
|
contract.setAmount(contractService.getOne(queryWrapper).getAmount());
|
|
//查询合同产品
|
|
//查询合同产品
|
|
List<ContractProduct> contractProductList = contractProductService.list(Wrappers.<ContractProduct>query().lambda().in(ContractProduct::getContractId,contractIds));
|
|
List<ContractProduct> contractProductList = contractProductService.list(Wrappers.<ContractProduct>query().lambda().in(ContractProduct::getContractId,contractIds));
|
|
- //查询合同产品
|
|
|
|
|
|
+ productInfoService.attributeAssign(contractProductList, ContractProduct::getProductId, (item, product) -> {
|
|
|
|
+ item.setProductCnName(product.getName());
|
|
|
|
+ item.setProductCode(product.getCode());
|
|
|
|
+ item.setProductUnit(product.getUnit());
|
|
|
|
+ });
|
|
|
|
+ //查询合同其他收费项目
|
|
List<ContractProject> contractProjectList = contractProjectService.list(Wrappers.<ContractProject>query().lambda().in(ContractProject::getContractId,contractIds));
|
|
List<ContractProject> contractProjectList = contractProjectService.list(Wrappers.<ContractProject>query().lambda().in(ContractProject::getContractId,contractIds));
|
|
map.put("contractProductList",contractProductList);
|
|
map.put("contractProductList",contractProductList);
|
|
map.put("contractProjectList",contractProjectList);
|
|
map.put("contractProjectList",contractProjectList);
|