合同，采购明细 添加历史毛利信息

hx-mail/src/main/java/com/fjhx/mail/service/message/impl/InfoServiceImpl.java

@@ -334,6 +334,9 @@ public class InfoServiceImpl implements InfoService {
         }
 
         List<MessageVo> records = page.getRecords();
+        if (ObjectUtil.isEmpty(records)) {
+            return R.ok(page);
+        }
         List<Long> messageIds = records.stream().map(MessageVo::getId).collect(Collectors.toList());
 
         //赋值邮件附件信息

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

@@ -221,5 +221,10 @@ public class ContractVo extends Contract {
      */
     private BigDecimal sumContractNotClaimMoney;
 
+    /**
+     * 历史毛利信息
+     */
+    List<ContractBudgetVo.GrossProfitInfo> grossProfitInfoList;
+
 }
 

hx-sale/src/main/java/com/fjhx/sale/entity/purchase/vo/EhsdPurchaseVo.java

@@ -1,11 +1,8 @@
 package com.fjhx.sale.entity.purchase.vo;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.fjhx.common.entity.corporation.po.Corporation;
-import com.fjhx.sale.entity.pack.po.PackDetailProduct;
+import com.fjhx.sale.entity.contract.vo.ContractBudgetVo;
 import com.fjhx.sale.entity.pack.vo.PackDetailProductVo;
 import com.fjhx.sale.entity.purchase.po.EhsdPurchase;
-import com.fjhx.sale.entity.purchase.po.EhsdPurchaseProduct;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -88,4 +85,9 @@ public class EhsdPurchaseVo extends EhsdPurchase {
      * 付款总金额
      */
     private BigDecimal sumPayMoney;
+
+    /**
+     * 历史毛利信息
+     */
+    List<ContractBudgetVo.GrossProfitInfo> grossProfitInfoList;
 }

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

@@ -474,7 +474,7 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
         wrapper.le("t1", Contract::getCreateTime, dto.getEndTime());
 
         //销售合同id过滤
-        wrapper.eq("t1", Contract::getId, dto.getId());
+        wrapper.eq("t1.contractId", dto.getId());
 
         //是否结清过滤
         wrapper.eq("t1", Contract::getIsSettled, dto.getIsSettled());
@@ -1079,6 +1079,17 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
         result.setBuyCountryName(areaMapByIds.get(result.getBuyCountryId()));
         result.setBuyProvinceName(areaMapByIds.get(result.getBuyProvinceId()));
         result.setBuyCityName(areaMapByIds.get(result.getBuyCityId()));
+
+        //赋值历史毛利图信息
+        ContractSelectDto contractSelectDto = new ContractSelectDto();
+        contractSelectDto.setId(result.getId());
+        Page<ContractBudgetVo> profitBudgetPage = getProfitBudgetPage(contractSelectDto);
+        List<ContractBudgetVo> records = profitBudgetPage.getRecords();
+        if (ObjectUtil.isNotEmpty(records)) {
+            ContractBudgetVo contractBudgetVo = records.get(0);
+            List<ContractBudgetVo.GrossProfitInfo> grossProfitInfoList = contractBudgetVo.getGrossProfitInfoList();
+            result.setGrossProfitInfoList(grossProfitInfoList);
+        }
         return result;
     }
 

hx-sale/src/main/java/com/fjhx/sale/service/purchase/impl/EhsdPurchaseServiceImpl.java

@@ -36,7 +36,9 @@ import com.fjhx.purchase.service.invoice.InvoiceDetailsService;
 import com.fjhx.purchase.service.pay.PayDetailService;
 import com.fjhx.purchase.service.pay.PayService;
 import com.fjhx.purchase.service.subscribe.SubscribeDetailService;
+import com.fjhx.sale.entity.contract.dto.ContractSelectDto;
 import com.fjhx.sale.entity.contract.po.ContractProduct;
+import com.fjhx.sale.entity.contract.vo.ContractBudgetVo;
 import com.fjhx.sale.entity.pack.po.PackDetail;
 import com.fjhx.sale.entity.pack.po.PackDetailProduct;
 import com.fjhx.sale.entity.pack.vo.PackDetailProductVo;
@@ -49,6 +51,7 @@ import com.fjhx.sale.entity.purchase.vo.EhsdPurchaseVo;
 import com.fjhx.sale.entity.sample.po.SampleProduct;
 import com.fjhx.sale.mapper.purchase.EhsdPurchaseMapper;
 import com.fjhx.sale.service.contract.ContractProductService;
+import com.fjhx.sale.service.contract.ContractService;
 import com.fjhx.sale.service.pack.PackDetailProductService;
 import com.fjhx.sale.service.pack.PackDetailService;
 import com.fjhx.sale.service.purchase.*;
@@ -126,6 +129,8 @@ public class EhsdPurchaseServiceImpl extends ServiceImpl<EhsdPurchaseMapper, Ehs
     private AccountManagementService accountManagementService;
     @Autowired
     private SupplierPriceService supplierPriceService;
+    @Autowired
+    private ContractService contractService;
 
     /**
      * 分页
@@ -303,6 +308,17 @@ public class EhsdPurchaseServiceImpl extends ServiceImpl<EhsdPurchaseMapper, Ehs
         });
         result.setPurchaseArrivalList(ehsdPurchaseArrivalList);
 
+        //赋值历史毛利图信息
+        ContractSelectDto contractSelectDto = new ContractSelectDto();
+        contractSelectDto.setId(result.getDataResourceId());
+        Page<ContractBudgetVo> profitBudgetPage = contractService.getProfitBudgetPage(contractSelectDto);
+        List<ContractBudgetVo> records = profitBudgetPage.getRecords();
+        if (ObjectUtil.isNotEmpty(records)) {
+            ContractBudgetVo contractBudgetVo = records.get(0);
+            List<ContractBudgetVo.GrossProfitInfo> grossProfitInfoList = contractBudgetVo.getGrossProfitInfoList();
+            result.setGrossProfitInfoList(grossProfitInfoList);
+        }
+
         return result;
     }