利润结算表统计头部

hx-sale/src/main/java/com/fjhx/sale/service/statement/impl/SaleStatementServiceImpl.java

@@ -601,15 +601,15 @@ public class SaleStatementServiceImpl implements SaleStatementService {
         BigDecimal totalExpensesSumAmount = BigDecimal.ZERO;
         BigDecimal grossProfitMargin = BigDecimal.ZERO;
         for (ProfitSettlementVo p : list) {
-            contractSumAmount = contractSumAmount.add(p.getContractAmount());//合同金额
-            contractArrivalSumAmount = contractArrivalSumAmount.add(p.getContractArrival());//合同到账
-            taxReturnMoneySumAmount = taxReturnMoneySumAmount.add(p.getTaxReturnMoney());//退税
-            otherIncomeSumAmount = otherIncomeSumAmount.add(p.getOtherIncome());//其他收入
-            payForGoodsSumAmount = payForGoodsSumAmount.add(p.getPayForGoods());//支付货款
-            otherExpensesSumAmount = otherExpensesSumAmount.add(p.getOtherExpenses());//其他支出
-            totalIncomeSumAmount = totalIncomeSumAmount.add(p.getTotalIncome());//收入
-            totalExpensesSumAmount = totalExpensesSumAmount.add(p.getTotalExpenses());//支出
-            purchaseSumAmount = purchaseSumAmount.add(p.getPurchaseAmount());
+            contractSumAmount = contractSumAmount.add(ObjectUtil.isEmpty(p.getContractAmount())?BigDecimal.ZERO:p.getContractAmount());//合同金额
+            contractArrivalSumAmount = contractArrivalSumAmount.add(ObjectUtil.isEmpty(p.getContractArrival())?BigDecimal.ZERO:p.getContractArrival());//合同到账
+            taxReturnMoneySumAmount = taxReturnMoneySumAmount.add(ObjectUtil.isEmpty(p.getTaxReturnMoney())?BigDecimal.ZERO:p.getTaxReturnMoney());//退税
+            otherIncomeSumAmount = otherIncomeSumAmount.add(ObjectUtil.isEmpty(p.getOtherIncome())?BigDecimal.ZERO:p.getOtherIncome());//其他收入
+            payForGoodsSumAmount = payForGoodsSumAmount.add(ObjectUtil.isEmpty(p.getPayForGoods())?BigDecimal.ZERO:p.getPayForGoods());//支付货款
+            otherExpensesSumAmount = otherExpensesSumAmount.add(ObjectUtil.isEmpty(p.getOtherExpenses())?BigDecimal.ZERO:p.getOtherExpenses());//其他支出
+            totalIncomeSumAmount = totalIncomeSumAmount.add(ObjectUtil.isEmpty(p.getTotalIncome())?BigDecimal.ZERO:p.getTotalIncome());//收入
+            totalExpensesSumAmount = totalExpensesSumAmount.add(ObjectUtil.isEmpty(p.getTotalExpenses())?BigDecimal.ZERO:p.getTotalExpenses());//支出
+            purchaseSumAmount = purchaseSumAmount.add(ObjectUtil.isEmpty(p.getPurchaseAmount())?BigDecimal.ZERO:p.getPurchaseAmount());
         }
         //计算总毛利和总毛利率
         BigDecimal grossProfitSum = totalIncomeSumAmount.subtract(totalExpensesSumAmount);//毛利