From b0c6337b91ec54344d21a54fe2dab06376586399 Mon Sep 17 00:00:00 2001
From: chenhao <852066789@qq.com>
Date: Mon, 28 Oct 2024 16:42:34 +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:=E9=87=91=E9=A2=9D=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../palmte/work/model/ProjectBudgetCostDetailBase.java   | 8 ++++++++
 .../palmte/work/model/ProjectBudgetCostDetailTemp.java   | 1 +
 .../model/ProjectBudgetCostProjectManageDetailBase.java  | 9 +++++++++
 .../model/ProjectBudgetCostProjectManageDetailTemp.java  | 1 +
 4 files changed, 19 insertions(+)

diff --git a/src/main/java/cn/palmte/work/model/ProjectBudgetCostDetailBase.java b/src/main/java/cn/palmte/work/model/ProjectBudgetCostDetailBase.java
index 0fb7374..a870956 100644
--- a/src/main/java/cn/palmte/work/model/ProjectBudgetCostDetailBase.java
+++ b/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;
         }
diff --git a/src/main/java/cn/palmte/work/model/ProjectBudgetCostDetailTemp.java b/src/main/java/cn/palmte/work/model/ProjectBudgetCostDetailTemp.java
index 73db0d2..60f916d 100644
--- a/src/main/java/cn/palmte/work/model/ProjectBudgetCostDetailTemp.java
+++ b/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;
     }
 }
\ No newline at end of file
diff --git a/src/main/java/cn/palmte/work/model/ProjectBudgetCostProjectManageDetailBase.java b/src/main/java/cn/palmte/work/model/ProjectBudgetCostProjectManageDetailBase.java
index 89bc45f..1ebc9cd 100644
--- a/src/main/java/cn/palmte/work/model/ProjectBudgetCostProjectManageDetailBase.java
+++ b/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;
         }
diff --git a/src/main/java/cn/palmte/work/model/ProjectBudgetCostProjectManageDetailTemp.java b/src/main/java/cn/palmte/work/model/ProjectBudgetCostProjectManageDetailTemp.java
index 60b66c4..51eb3a7 100644
--- a/src/main/java/cn/palmte/work/model/ProjectBudgetCostProjectManageDetailTemp.java
+++ b/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;
     }
 }
\ No newline at end of file