diff --git a/src/main/java/cn/palmte/work/model/ProjectBudgetIncomeDetailBase.java b/src/main/java/cn/palmte/work/model/ProjectBudgetIncomeDetailBase.java index c1b6e8e..dfa3035 100644 --- a/src/main/java/cn/palmte/work/model/ProjectBudgetIncomeDetailBase.java +++ b/src/main/java/cn/palmte/work/model/ProjectBudgetIncomeDetailBase.java @@ -30,6 +30,12 @@ public class ProjectBudgetIncomeDetailBase { private String param; + public void setTotalTaxInclude(BigDecimal totalTaxInclude) { + this.totalTaxInclude = totalTaxInclude; + } + + private BigDecimal totalTaxInclude; + private String unit; private BigDecimal amount; private BigDecimal price; @@ -130,10 +136,15 @@ public class ProjectBudgetIncomeDetailBase { } public BigDecimal getTotalTaxInclude(){ + // 之前含税总金额为单价*价格 后续更改为手动数据 兼容之前版本数据 + if (totalTaxInclude!=null){ + return totalTaxInclude; + } if(null == price){ return BigDecimal.ZERO; } return price.multiply(amount); + // return totalIn } public BigDecimal getTotalTaxExclude(){ BigDecimal totalTaxInclude = getTotalTaxInclude();