Merge remote-tracking branch 'origin/master'

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

@@ -1,13 +1,13 @@
 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;
 
 public class Expense extends ActEntity<Expense> {
-    //项目定义
-    private String projectId;
     //项目名称
     private String projectName;
+    //项目定义
+    private String projectId;
     //项目批次
     private String projectBatch;
     //施工费合同折扣
@@ -25,9 +25,18 @@ public class Expense extends ActEntity<Expense> {
     //发文中监理费金额（不含税）
     private Double documentSupervisionCost;
 
+    private String status;
     private Double designFeePayable;//设计费应付金额
-
     private Double constructionFeePayable;//施工费应付金额
+    private Double supervisorFeePayable;//监理费应付金额
+
+    public Double getSupervisorFeePayable() {
+        return supervisorFeePayable;
+    }
+
+    public void setSupervisorFeePayable(Double supervisorFeePayable) {
+        this.supervisorFeePayable = supervisorFeePayable;
+    }
 
     public Double getDesignFeePayable() {
         return designFeePayable;
@@ -37,24 +46,22 @@ public class Expense extends ActEntity<Expense> {
         this.designFeePayable = designFeePayable;
     }
 
-    public Double getConstructionFeePayable() {
-        return constructionFeePayable;
+    public String getStatus() {
+        return status;
     }
 
-    public void setConstructionFeePayable(Double constructionFeePayable) {
-        this.constructionFeePayable = constructionFeePayable;
+    public void setStatus(String status) {
+        this.status = status;
     }
 
-    @ExcelField(title="项目定义", align=2, sort=1)
-    public String getProjectId() {
-        return projectId;
+    public Double getConstructionFeePayable() {
+        return constructionFeePayable;
     }
 
-    public void setProjectId(String projectId) {
-        this.projectId = projectId;
+    public void setConstructionFeePayable(Double constructionFeePayable) {
+        this.constructionFeePayable = constructionFeePayable;
     }
 
-    @ExcelField(title="项目名称", align=2, sort=2)
     public String getProjectName() {
         return projectName;
     }
@@ -63,7 +70,14 @@ public class Expense extends ActEntity<Expense> {
         this.projectName = projectName;
     }
 
-    @ExcelField(title="项目批次", align=2, sort=3)
+    public String getProjectId() {
+        return projectId;
+    }
+
+    public void setProjectId(String projectId) {
+        this.projectId = projectId;
+    }
+
     public String getProjectBatch() {
         return projectBatch;
     }
@@ -72,7 +86,6 @@ public class Expense extends ActEntity<Expense> {
         this.projectBatch = projectBatch;
     }
 
-    @ExcelField(title="施工费合同折扣", align=2, sort=4)
     public Double getConstructionCost() {
         return constructionCost;
     }
@@ -81,7 +94,6 @@ public class Expense extends ActEntity<Expense> {
         this.constructionCost = constructionCost;
     }
 
-    @ExcelField(title="设计费合同折扣", align=2, sort=5)
     public Double getDesignCost() {
         return designCost;
     }
@@ -90,7 +102,6 @@ public class Expense extends ActEntity<Expense> {
         this.designCost = designCost;
     }
 
-    @ExcelField(title="设计费典型设计折扣", align=2, sort=6)
     public Double getDesignTypeicalCost() {
         return designTypeicalCost;
     }
@@ -99,7 +110,6 @@ public class Expense extends ActEntity<Expense> {
         this.designTypeicalCost = designTypeicalCost;
     }
 
-    @ExcelField(title="监理费合同折扣", align=2, sort=7)
     public Double getSupervisionCost() {
         return supervisionCost;
     }
@@ -108,7 +118,6 @@ public class Expense extends ActEntity<Expense> {
         this.supervisionCost = supervisionCost;
     }
 
-    @ExcelField(title="监理费典型折扣", align=2, sort=8)
     public Double getSupervisionTypeicalCost() {
         return supervisionTypeicalCost;
     }
@@ -117,7 +126,6 @@ public class Expense extends ActEntity<Expense> {
         this.supervisionTypeicalCost = supervisionTypeicalCost;
     }
 
-    @ExcelField(title="发文中设计费金额（不含税）", align=2, sort=9)
     public Double getDocumentDesignCost() {
         return documentDesignCost;
     }
@@ -126,7 +134,6 @@ public class Expense extends ActEntity<Expense> {
         this.documentDesignCost = documentDesignCost;
     }
 
-    @ExcelField(title="发文中监理费金额（不含税）", align=2, sort=10)
     public Double getDocumentSupervisionCost() {
         return documentSupervisionCost;
     }