From 3bbf91127acd2341582e8c1b81ccbf50fcdbfc1d Mon Sep 17 00:00:00 2001
From: chenhao <852066789@qq.com>
Date: Mon, 28 Oct 2024 14:50:07 +0800
Subject: [PATCH] =?UTF-8?q?feat=20=E6=94=B6=E5=85=A5=E6=98=8E=E7=BB=86?=
 =?UTF-8?q?=E8=A1=A8:=201:=E8=B5=84=E9=87=91=E8=AE=A1=E5=88=92=E8=A1=A8?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../work/model/ProjectBudgetPlanDetail.java   |  4 ++--
 .../work/service/ProjectBudgetService.java    | 20 ++++++++++++++-----
 2 files changed, 17 insertions(+), 7 deletions(-)

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<String, BigDecimal> 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);