问题处理

hx-sale/src/main/java/com/fjhx/sale/service/contract/impl/ContractServiceImpl.java

@@ -425,6 +425,20 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
         // 获取交接单附件
         Map<Long, List<FileInfoVo>> fileMap = ObsFileUtil.getFileMap(ids, 1);
 
+        //获取合同产品明细
+        List<ContractProduct> productList = contractProductService.list(q -> q.in(ContractProduct::getContractId, ids));
+        List<ContractProductVo> contractProductVos = BeanUtil.copyToList(productList, ContractProductVo.class);
+        //赋值物料信息
+        productInfoService.attributeAssign(contractProductVos, ContractProduct::getProductId, (item, productInfo) -> {
+            item.setProductCode(productInfo.getCustomCode());
+            item.setProductName(productInfo.getName());
+            item.setProductLength(productInfo.getLength());
+            item.setProductWidth(productInfo.getWidth());
+            item.setProductHeight(productInfo.getHeight());
+        });
+        Map<Long, List<ContractProductVo>> cpMap = contractProductVos.stream().collect(Collectors.groupingBy(ContractProduct::getContractId));
+
+
         // 获取包装附件
         Map<Long, List<FileInfoVo>> packageFileMap = ObsFileUtil.getFileMap(ids, 2);
         for (ContractVo p : list) {
@@ -460,6 +474,9 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
             //赋值销售部门
             p.setDeptName(companyMap.get(p.getDeptId()));
 
+            //赋值产品明细
+            p.setContractProductList(cpMap.get(p.getId()));
+
         }
 
         // 赋值流程id