|
@@ -458,7 +458,7 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
|
|
Map<Long, List<FileInfoVo>> fileMap = ObsFileUtil.getFileMap(ids, 1);
|
|
Map<Long, List<FileInfoVo>> fileMap = ObsFileUtil.getFileMap(ids, 1);
|
|
|
|
|
|
//获取合同产品明细
|
|
//获取合同产品明细
|
|
- List<ContractProductVo> contractProductVos = contractProductService.getList(IWrapper.<ContractProduct>getWrapper().in(ContractProduct::getContractId, ids));
|
|
|
|
|
|
+ List<ContractProductVo> contractProductVos = contractProductService.getList(IWrapper.<ContractProduct>getWrapper().in("cp", ContractProduct::getContractId, ids));
|
|
//赋值物料信息
|
|
//赋值物料信息
|
|
productInfoService.attributeAssign(contractProductVos, ContractProduct::getProductId, (item, productInfo) -> {
|
|
productInfoService.attributeAssign(contractProductVos, ContractProduct::getProductId, (item, productInfo) -> {
|
|
item.setProductCode(productInfo.getCustomCode());
|
|
item.setProductCode(productInfo.getCustomCode());
|