feat 收入明细表:

1:金额修改

src/main/java/cn/palmte/work/model/ProjectBudgetCostDetailBase.java

@@ -49,6 +49,7 @@ public class ProjectBudgetCostDetailBase {
     @Temporal(TemporalType.TIMESTAMP)
     private Date payTime;
 
+    private BigDecimal totalTaxInclude;
     @Column(name = "pay_amount")
     private BigDecimal payAmount;
 
@@ -186,7 +187,14 @@ public class ProjectBudgetCostDetailBase {
         this.remark = remark;
     }
 
+    public void setTotalTaxInclude(BigDecimal totalTaxInclude) {
+        this.totalTaxInclude = totalTaxInclude;
+    }
     public BigDecimal getTotalTaxInclude(){
+        //  之前含税总金额为单价*价格  后续更改为手动数据  兼容之前版本数据
+        if (totalTaxInclude!=null){
+            return totalTaxInclude;
+        }
         if(null == price){
             return BigDecimal.ZERO;
         }

src/main/java/cn/palmte/work/model/ProjectBudgetCostDetailTemp.java

@@ -27,6 +27,7 @@ public class ProjectBudgetCostDetailTemp extends ProjectBudgetCostDetailBase{
         detail.setPayAmount(getPayAmount());
         detail.setPayWay(getPayWay());
         detail.setRemark(getRemark());
+        detail.setTotalTaxInclude(getTotalTaxInclude());
         return detail;
     }
 }

src/main/java/cn/palmte/work/model/ProjectBudgetCostProjectManageDetailBase.java

@@ -51,6 +51,12 @@ public class ProjectBudgetCostProjectManageDetailBase {
     @Column(name = "is_diy")
     private int isDiy;
 
+    private BigDecimal total;
+
+    public void setTotal(BigDecimal total) {
+        this.total = total;
+    }
+
     /**
      * 是否可以被删除，有些项是默认的不可删除，用于页面判断是否显示删除按钮
      */
@@ -161,6 +167,9 @@ public class ProjectBudgetCostProjectManageDetailBase {
     }
 
     public BigDecimal getTotal(){
+        if (total!=null){
+            return total;
+        }
         if(null == price){
             return BigDecimal.ZERO;
         }

src/main/java/cn/palmte/work/model/ProjectBudgetCostProjectManageDetailTemp.java

@@ -27,6 +27,7 @@ public class ProjectBudgetCostProjectManageDetailTemp extends ProjectBudgetCostP
         detail.setRemark(getRemark());
         detail.setDeletable(getDeletable());
         detail.setIsDiy(getIsDiy());
+        detail.setTotal(getTotal());
         return detail;
     }
 }