From 8ca296b7c0a48cf2df14da1be15856e2094a0c2a Mon Sep 17 00:00:00 2001 From: OathK1per Date: Thu, 13 Jan 2022 16:35:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=AF=B9=E5=85=B6=E4=BB=96?= =?UTF-8?q?=E7=9A=84=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/palmte/work/bean/BudgetSettleBean.java | 2 +- .../palmte/work/bean/EstimateSettleBean.java | 2 +- .../java/cn/palmte/work/bean/FinalBean.java | 4 +-- .../cn/palmte/work/bean/IncomeCostBean.java | 6 +++++ .../java/cn/palmte/work/bean/SettleBean.java | 3 +++ .../cn/palmte/work/bean/SettleMonthBean.java | 3 +++ .../templates/admin/project_approve.ftl | 26 +++++++++---------- .../templates/admin/project_estimate_edit.ftl | 4 +-- .../templates/admin/project_settle_edit.ftl | 2 +- 9 files changed, 32 insertions(+), 20 deletions(-) diff --git a/src/main/java/cn/palmte/work/bean/BudgetSettleBean.java b/src/main/java/cn/palmte/work/bean/BudgetSettleBean.java index 516c894..86b0747 100644 --- a/src/main/java/cn/palmte/work/bean/BudgetSettleBean.java +++ b/src/main/java/cn/palmte/work/bean/BudgetSettleBean.java @@ -232,7 +232,7 @@ public class BudgetSettleBean { } public BigDecimal getCostOtherBudgetTotal() { - return costOtherBudgetTotal; + return (costOtherBudgetTotal == null)?BigDecimal.ZERO:costOtherBudgetTotal; } public void setCostOtherBudgetTotal(BigDecimal costOtherBudgetTotal) { diff --git a/src/main/java/cn/palmte/work/bean/EstimateSettleBean.java b/src/main/java/cn/palmte/work/bean/EstimateSettleBean.java index 9e3b5ec..20d8c04 100644 --- a/src/main/java/cn/palmte/work/bean/EstimateSettleBean.java +++ b/src/main/java/cn/palmte/work/bean/EstimateSettleBean.java @@ -169,7 +169,7 @@ public class EstimateSettleBean { } public BigDecimal getCostOtherEstimateTotal() { - return costOtherEstimateTotal; + return (costOtherEstimateTotal == null)?BigDecimal.ZERO:costOtherEstimateTotal; } public void setCostOtherEstimateTotal(BigDecimal costOtherEstimateTotal) { diff --git a/src/main/java/cn/palmte/work/bean/FinalBean.java b/src/main/java/cn/palmte/work/bean/FinalBean.java index afe8d7f..ac80667 100644 --- a/src/main/java/cn/palmte/work/bean/FinalBean.java +++ b/src/main/java/cn/palmte/work/bean/FinalBean.java @@ -83,7 +83,7 @@ public class FinalBean { BigDecimal costOtherFinalTotal = getCostOtherFinalTotal(); if (null == costPurchaseDeviceFinalTotal || null == costPurchaseBuildFinalTotal || null == costPurchaseServiceFinalTotal - || null == costPurchaseOtherFinalTotal || null == costProjectManageFinalTotal || null == costOtherFinalTotal) { + || null == costPurchaseOtherFinalTotal || null == costProjectManageFinalTotal) { return new BigDecimal(0); } @@ -472,7 +472,7 @@ public class FinalBean { } public BigDecimal getCostOtherFinalTotal() { - return costOtherFinalTotal; + return (costOtherFinalTotal == null)?BigDecimal.ZERO:costOtherFinalTotal; } public void setCostOtherFinalTotal(BigDecimal costOtherFinalTotal) { diff --git a/src/main/java/cn/palmte/work/bean/IncomeCostBean.java b/src/main/java/cn/palmte/work/bean/IncomeCostBean.java index addaf3c..f2affd9 100644 --- a/src/main/java/cn/palmte/work/bean/IncomeCostBean.java +++ b/src/main/java/cn/palmte/work/bean/IncomeCostBean.java @@ -285,6 +285,9 @@ public abstract class IncomeCostBean { } public BigDecimal getCostOtherOtherTaxInclude() { + if (costOtherOtherTaxInclude == null) { + return BigDecimal.ZERO; + } return handleSpecial(costOtherOtherTaxInclude); } @@ -333,6 +336,9 @@ public abstract class IncomeCostBean { } public BigDecimal getCostOtherOtherTaxExclude() { + if (costOtherOtherTaxExclude == null) { + return BigDecimal.ZERO; + } return handleSpecial(costOtherOtherTaxExclude); } diff --git a/src/main/java/cn/palmte/work/bean/SettleBean.java b/src/main/java/cn/palmte/work/bean/SettleBean.java index 9c30c55..a0f8b11 100644 --- a/src/main/java/cn/palmte/work/bean/SettleBean.java +++ b/src/main/java/cn/palmte/work/bean/SettleBean.java @@ -339,6 +339,9 @@ public class SettleBean { } public BigDecimal getCostOther() { + if (costOther == null) { + return BigDecimal.ZERO; + } return handleSpecial(costOther); } diff --git a/src/main/java/cn/palmte/work/bean/SettleMonthBean.java b/src/main/java/cn/palmte/work/bean/SettleMonthBean.java index 378bc8a..3b2da38 100644 --- a/src/main/java/cn/palmte/work/bean/SettleMonthBean.java +++ b/src/main/java/cn/palmte/work/bean/SettleMonthBean.java @@ -484,6 +484,9 @@ public class SettleMonthBean { } public BigDecimal getCostOther() { + if (costOther == null) { + return BigDecimal.ZERO; + } return handleSpecial(costOther); } diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl index 49c7f2a..b8bb805 100644 --- a/src/main/resources/templates/admin/project_approve.ftl +++ b/src/main/resources/templates/admin/project_approve.ftl @@ -355,8 +355,8 @@ 成本 其他 ${project.otherName!} - - + + 合计 @@ -901,8 +901,8 @@ 成本 其他 ${project.otherName!} - - + + 合计 @@ -1169,11 +1169,11 @@ 成本 其他 ${project.otherName!} - - - - - + + + + + 合计 @@ -1521,10 +1521,10 @@ 成本 其他 ${project.otherName!} - - - - + + + + 合计 diff --git a/src/main/resources/templates/admin/project_estimate_edit.ftl b/src/main/resources/templates/admin/project_estimate_edit.ftl index 7516f11..bd25d56 100644 --- a/src/main/resources/templates/admin/project_estimate_edit.ftl +++ b/src/main/resources/templates/admin/project_estimate_edit.ftl @@ -365,8 +365,8 @@ 其他 - - readonly> + + readonly> - + 合计