diff --git a/src/main/java/cn/palmte/work/service/ProjectBudgetService.java b/src/main/java/cn/palmte/work/service/ProjectBudgetService.java index 6d49b46..3a928e6 100644 --- a/src/main/java/cn/palmte/work/service/ProjectBudgetService.java +++ b/src/main/java/cn/palmte/work/service/ProjectBudgetService.java @@ -789,7 +789,7 @@ public class ProjectBudgetService { BigDecimal engineerCost = calEngineerCost(budgetCostDetail); BigDecimal projectManageCost = calProjectManageCost(budgetCostProjectManageDetail); - BigDecimal saleIncome = calSaleIncome(budgetIncomeDetail); + BigDecimal saleIncome = calSaleIncome(projectBudgetPlanDetails); BigDecimal earnestMoneyIncome = new BigDecimal(0); BigDecimal earnestMoneyCost = new BigDecimal(0); @@ -838,11 +838,11 @@ public class ProjectBudgetService { return projectBudgetPlanDetail; } - private BigDecimal calSaleIncome(List budgetIncomeDetail) { + private BigDecimal calSaleIncome( List projectBudgetPlanDetails) { BigDecimal saleIncome = new BigDecimal(0); - if(CollectionUtil.isNotEmpty(budgetIncomeDetail)){ - for (ProjectBudgetIncomeDetail projectBudgetIncomeDetail : budgetIncomeDetail) { - saleIncome = saleIncome.add(projectBudgetIncomeDetail.getTotalTaxInclude()); + if(CollectionUtil.isNotEmpty(projectBudgetPlanDetails)){ + for (ProjectBudgetPlanDetail detail : projectBudgetPlanDetails) { + saleIncome = saleIncome.add(detail.getSaleIncome()); } } return saleIncome;