From 5209e2c8d0efc364f640c8fd7c78fdd9d420b83f Mon Sep 17 00:00:00 2001
From: chenhao <852066789@qq.com>
Date: Thu, 31 Oct 2024 11:00:52 +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:=E4=BA=A7=E5=93=81=E5=A4=A7=E7=B1=BB=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=AD=97=E7=AC=A6=E4=B8=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/palmte/work/bean/IncomeCostBean.java   | 11 +++++-----
 .../cn/palmte/work/model/ProjectBudget.java   | 20 +++++++++++++++++++
 .../work/service/ProjectBudgetService.java    |  7 +++++--
 3 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/src/main/java/cn/palmte/work/bean/IncomeCostBean.java b/src/main/java/cn/palmte/work/bean/IncomeCostBean.java
index 46b9569..1ba63f3 100644
--- a/src/main/java/cn/palmte/work/bean/IncomeCostBean.java
+++ b/src/main/java/cn/palmte/work/bean/IncomeCostBean.java
@@ -458,16 +458,17 @@ public abstract class IncomeCostBean {
                 || null == costPurchaseBuildTaxExclude
                 || null == costPurchaseServiceTaxExclude
                 || null == costPurchaseOtherTaxExclude
-                || null == costProjectManageTaxExclude
-                || null == costOtherOtherTaxExclude) {
+                // || null == costProjectManageTaxExclude
+                // || null == costOtherOtherTaxExclude
+        ) {
             return handleSpecial(null);
         }
         return costPurchaseDeviceTaxExclude
                 .add(costPurchaseBuildTaxExclude)
                 .add(costPurchaseServiceTaxExclude)
-                .add(costPurchaseOtherTaxExclude)
-                .add(costProjectManageTaxExclude)
-                .add(costOtherOtherTaxExclude);
+                .add(costPurchaseOtherTaxExclude);
+                // .add(costProjectManageTaxExclude)
+                // .add(costOtherOtherTaxExclude);
     }
 
     /**
diff --git a/src/main/java/cn/palmte/work/model/ProjectBudget.java b/src/main/java/cn/palmte/work/model/ProjectBudget.java
index 0ea7308..69a7e46 100644
--- a/src/main/java/cn/palmte/work/model/ProjectBudget.java
+++ b/src/main/java/cn/palmte/work/model/ProjectBudget.java
@@ -118,8 +118,12 @@ public class ProjectBudget {
     private Integer industrySceneBudget;
     @Column(name = "cost_detail_attr")
     private String  costDetailAttr;
+    @Column(name = "cost_detail_attr_name")
+    private String  costDetailAttrName;
     @Column(name = "income_detail_attr")
     private String  incomeDetailAttr;
+    @Column(name = "income_detail_attr_name")
+    private String  incomeDetailAttrName;
     /**
      * 行业场景应用
      */
@@ -245,6 +249,22 @@ public class ProjectBudget {
     @Transient
     private String advancePeakAmountRoundBudget;
 
+    public String getCostDetailAttrName() {
+        return costDetailAttrName;
+    }
+
+    public void setCostDetailAttrName(String costDetailAttrName) {
+        this.costDetailAttrName = costDetailAttrName;
+    }
+
+    public String getIncomeDetailAttrName() {
+        return incomeDetailAttrName;
+    }
+
+    public void setIncomeDetailAttrName(String incomeDetailAttrName) {
+        this.incomeDetailAttrName = incomeDetailAttrName;
+    }
+
     public String getCostDetailAttr() {
         return costDetailAttr;
     }
diff --git a/src/main/java/cn/palmte/work/service/ProjectBudgetService.java b/src/main/java/cn/palmte/work/service/ProjectBudgetService.java
index 8bf22da..531e64f 100644
--- a/src/main/java/cn/palmte/work/service/ProjectBudgetService.java
+++ b/src/main/java/cn/palmte/work/service/ProjectBudgetService.java
@@ -778,7 +778,8 @@ public class ProjectBudgetService {
         BigDecimal projectCost = new BigDecimal(0);
         BigDecimal serviceCost = new BigDecimal(0);
         BigDecimal otherCost = new BigDecimal(0);
-        BigDecimal deviceCost = calDeviceCost(budgetCostDetail);
+        // BigDecimal deviceCost = calDeviceCost(budgetCostDetail);
+        BigDecimal deviceCost = BigDecimal.ZERO;
         BigDecimal engineerCost = calEngineerCost(budgetCostDetail);
         BigDecimal projectManageCost = calProjectManageCost(budgetCostProjectManageDetail);
 
@@ -795,6 +796,8 @@ public class ProjectBudgetService {
                 projectCost = projectCost.add(budgetPlan.getProjectCost());
                 serviceCost = serviceCost.add(budgetPlan.getServiceCost());
                 otherCost=otherCost.add(budgetPlan.getOtherCost());
+
+                deviceCost=deviceCost.add(budgetPlan.getDeviceCost());
                 earnestMoneyCost = earnestMoneyCost.add(budgetPlan.getEarnestMoneyCost());
                 earnestMoneyIncome = earnestMoneyIncome.add(budgetPlan.getEarnestMoneyIncome());
                 capitalInterest = capitalInterest.add(budgetPlan.getCapitalInterest());
@@ -802,7 +805,7 @@ public class ProjectBudgetService {
                 repaymentPlan = repaymentPlan.add(budgetPlan.getRepaymentPlan());
             }
         }
-        BigDecimal totalCost = deviceCost.add(engineerCost).add(projectManageCost).add(earnestMoneyCost);
+        BigDecimal totalCost = deviceCost.add(projectCost).add(serviceCost).add(otherCost).add(projectManageCost).add(earnestMoneyCost);
         BigDecimal totalIncome = saleIncome.add(earnestMoneyIncome);
 
         //总余额等于总收入-总支出