冲突实体类

src/main/java/com/jeeplus/modules/sg/financial/expense/entity/Expense.java

@@ -1,5 +1,6 @@
 package com.jeeplus.modules.sg.financial.expense.entity;
 
+import com.jeeplus.common.utils.excel.annotation.ExcelField;
 import com.jeeplus.core.persistence.ActEntity;
 import com.jeeplus.modules.echarts.web.scatter.ScatterSample1;
 
@@ -62,14 +63,7 @@ public class Expense extends ActEntity<Expense> {
         this.constructionFeePayable = constructionFeePayable;
     }
 
-    public String getProjectName() {
-        return projectName;
-    }
-
-    public void setProjectName(String projectName) {
-        this.projectName = projectName;
-    }
-
+    @ExcelField(title="项目定义", align=2, sort=1)
     public String getProjectId() {
         return projectId;
     }
@@ -78,6 +72,16 @@ public class Expense extends ActEntity<Expense> {
         this.projectId = projectId;
     }
 
+    @ExcelField(title="项目名称", align=2, sort=2)
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
+    @ExcelField(title="项目批次", align=2, sort=3)
     public String getProjectBatch() {
         return projectBatch;
     }
@@ -86,6 +90,7 @@ public class Expense extends ActEntity<Expense> {
         this.projectBatch = projectBatch;
     }
 
+    @ExcelField(title="施工费合同折扣", align=2, sort=4)
     public Double getConstructionCost() {
         return constructionCost;
     }
@@ -94,6 +99,7 @@ public class Expense extends ActEntity<Expense> {
         this.constructionCost = constructionCost;
     }
 
+    @ExcelField(title="设计费合同折扣", align=2, sort=5)
     public Double getDesignCost() {
         return designCost;
     }
@@ -102,6 +108,7 @@ public class Expense extends ActEntity<Expense> {
         this.designCost = designCost;
     }
 
+    @ExcelField(title="设计费典型设计折扣", align=2, sort=6)
     public Double getDesignTypeicalCost() {
         return designTypeicalCost;
     }
@@ -110,6 +117,7 @@ public class Expense extends ActEntity<Expense> {
         this.designTypeicalCost = designTypeicalCost;
     }
 
+    @ExcelField(title="监理费合同折扣", align=2, sort=7)
     public Double getSupervisionCost() {
         return supervisionCost;
     }
@@ -118,6 +126,7 @@ public class Expense extends ActEntity<Expense> {
         this.supervisionCost = supervisionCost;
     }
 
+    @ExcelField(title="监理费典型折扣", align=2, sort=8)
     public Double getSupervisionTypeicalCost() {
         return supervisionTypeicalCost;
     }
@@ -126,6 +135,7 @@ public class Expense extends ActEntity<Expense> {
         this.supervisionTypeicalCost = supervisionTypeicalCost;
     }
 
+    @ExcelField(title="发文中设计费金额（不含税）", align=2, sort=9)
     public Double getDocumentDesignCost() {
         return documentDesignCost;
     }
@@ -134,6 +144,7 @@ public class Expense extends ActEntity<Expense> {
         this.documentDesignCost = documentDesignCost;
     }
 
+    @ExcelField(title="发文中监理费金额（不含税）", align=2, sort=10)
     public Double getDocumentSupervisionCost() {
         return documentSupervisionCost;
     }