diff --git a/src/main/java/cn/palmte/work/model/ProjectBudgetPlanDetail.java b/src/main/java/cn/palmte/work/model/ProjectBudgetPlanDetail.java index 9ef6a9c..5cc0e05 100644 --- a/src/main/java/cn/palmte/work/model/ProjectBudgetPlanDetail.java +++ b/src/main/java/cn/palmte/work/model/ProjectBudgetPlanDetail.java @@ -17,8 +17,8 @@ public class ProjectBudgetPlanDetail extends ProjectBudgetPlanDetailBase{ @Transient private BigDecimal serviceCost; // private BigDecimal deviceCost; - - // private BigDecimal projectCost; + @Transient + private BigDecimal projectCost; //其它支出 @Transient private BigDecimal otherCost; diff --git a/src/main/java/cn/palmte/work/service/ProjectBudgetService.java b/src/main/java/cn/palmte/work/service/ProjectBudgetService.java index fa2ce87..47781ff 100644 --- a/src/main/java/cn/palmte/work/service/ProjectBudgetService.java +++ b/src/main/java/cn/palmte/work/service/ProjectBudgetService.java @@ -677,6 +677,7 @@ public class ProjectBudgetService { BigDecimal projectManageCost = new BigDecimal(0); BigDecimal earnestMoneyCost = new BigDecimal(0); BigDecimal deviceCost = new BigDecimal(0); + BigDecimal projectCost = new BigDecimal(0); BigDecimal engineerCost = new BigDecimal(0); BigDecimal serviceCost = new BigDecimal(0); BigDecimal otherCost = new BigDecimal(0); @@ -695,13 +696,21 @@ public class ProjectBudgetService { String month = budgetPlan.getMonth(); Map projectPayments = monthlyProjectPaymentSum.getOrDefault(month, Collections.emptyMap()); - + deviceCost=deviceCost.add(budgetPlan.getDeviceCost()); projectManageCost = projectManageCost.add(budgetPlan.getProjectManageCost()); earnestMoneyCost = earnestMoneyCost.add(budgetPlan.getEarnestMoneyCost()); - deviceCost = deviceCost.add(projectPayments.getOrDefault("设备成本", BigDecimal.ZERO)); - engineerCost = engineerCost.add(projectPayments.getOrDefault("工程成本", BigDecimal.ZERO)); - serviceCost = serviceCost.add(projectPayments.getOrDefault("服务成本", BigDecimal.ZERO)); - otherCost = otherCost.add(projectPayments.getOrDefault("其他成本", BigDecimal.ZERO)); + engineerCost = engineerCost.add(budgetPlan.getEngineerCost()); + BigDecimal projectCostTemp = projectPayments.getOrDefault("工程成本", BigDecimal.ZERO); + budgetPlan.setProjectCost(projectCostTemp); + projectCost = projectCost.add(projectCostTemp); + + BigDecimal serviceCostTemp = projectPayments.getOrDefault("服务成本", BigDecimal.ZERO); + budgetPlan.setServiceCost(serviceCostTemp); + serviceCost = serviceCost.add(serviceCostTemp); + + BigDecimal otherCostTemp = projectPayments.getOrDefault("其他成本", BigDecimal.ZERO); + budgetPlan.setOtherCost(otherCostTemp); + otherCost = otherCost.add(otherCostTemp); totalCost = totalCost.add(budgetPlan.getTotalCost()); saleIncome = saleIncome.add(budgetPlan.getSaleIncome()); earnestMoneyIncome = earnestMoneyIncome.add(budgetPlan.getEarnestMoneyIncome()); @@ -721,6 +730,7 @@ public class ProjectBudgetService { projectBudgetPlanDetail.setMonth("合计"); projectBudgetPlanDetail.setDeviceCost(deviceCost); projectBudgetPlanDetail.setEngineerCost(engineerCost); + projectBudgetPlanDetail.setProjectCost(projectCost); projectBudgetPlanDetail.setServiceCost(serviceCost); // 设置服务成本 projectBudgetPlanDetail.setOtherCost(otherCost); // 设置其他成本 projectBudgetPlanDetail.setProjectManageCost(projectManageCost);