Ver Fonte

销售合同分页直接返回到账金额列表

yzc há 1 ano atrás
pai
commit
a0574ebffb

+ 7 - 1
hx-sale/src/main/java/com/fjhx/sale/entity/contract/vo/ContractVo.java

@@ -1,6 +1,7 @@
 package com.fjhx.sale.entity.contract.vo;
 
 import com.fjhx.file.entity.FileInfoVo;
+import com.fjhx.sale.entity.claim.po.ClaimContract;
 import com.fjhx.sale.entity.contract.po.Contract;
 import com.fjhx.sale.entity.contract.po.ContractProduct;
 import com.fjhx.sale.entity.contract.po.ContractProject;
@@ -104,7 +105,7 @@ public class ContractVo extends Contract {
     /**
      * 客户标签(存在多个用逗号隔开)
      */
-    private String  tag;
+    private String tag;
 
     /**
      * 客户名称
@@ -149,5 +150,10 @@ public class ContractVo extends Contract {
      */
     private String taxNumber;
 
+    /**
+     * 到账信息列表
+     */
+    private List<ClaimContract> claimContractList;
+
 }
 

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

@@ -280,6 +280,11 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
             corporationService.attributeAssign(list, ContractVo::getSellCorporationId, (item, corporation) -> {
                 item.setSellCorporationName(corporation.getName());
             });
+
+            //赋值到账金额信息列表
+            List<ClaimContract> listByContractIds = claimContractService.getListByContractIds(ids);
+            Map<Long, List<ClaimContract>> claimInfoMap = listByContractIds.stream().collect(Collectors.groupingBy(ClaimContract::getContractId));
+            list.forEach(item -> item.setClaimContractList(claimInfoMap.get(item.getId())));
         }
         return page;
     }