feat 收入明细表:

1:产品大类修改为字符串

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 == costProjectManageTaxExclude
-                || null == costOtherOtherTaxExclude) {
+                // || null == costOtherOtherTaxExclude
+        ) {
             return handleSpecial(null);
         }
         return costPurchaseDeviceTaxExclude
                 .add(costPurchaseBuildTaxExclude)
                 .add(costPurchaseServiceTaxExclude)
-                .add(costPurchaseOtherTaxExclude)
+                .add(costPurchaseOtherTaxExclude);
-                .add(costProjectManageTaxExclude)
+                // .add(costProjectManageTaxExclude)
-                .add(costOtherOtherTaxExclude);
+                // .add(costOtherOtherTaxExclude);
     }
 
     /**

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;
     }

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);
 
         //总余额等于总收入-总支出