From 2f509c0bddf94f7e4a8ed27444dcaf8165ab42b4 Mon Sep 17 00:00:00 2001 From: OathK1per Date: Tue, 27 Dec 2022 10:32:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86taxRate=E6=88=96price?= =?UTF-8?q?=E4=B8=BA=E9=9B=B6=E7=9A=84=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../work/controller/backend/ProjectController.java | 8 ++++---- .../palmte/work/model/ProjectBudgetCostDetailBase.java | 10 ++++++---- .../ProjectBudgetCostProjectManageDetailBase.java | 2 +- .../work/model/ProjectBudgetIncomeDetailBase.java | 10 ++++++---- 4 files changed, 17 insertions(+), 13 deletions(-) diff --git a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java index a32be48..6e88b75 100644 --- a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java +++ b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java @@ -370,7 +370,7 @@ public class ProjectController extends BaseController { Set rates = new HashSet<>(); StringBuilder incomeTaxSb = new StringBuilder(); for (ProjectBudgetIncomeDetail projectBudgetIncomeDetail : budgetIncomeDetail) { - if (!rates.contains(projectBudgetIncomeDetail.getTaxRate().toPlainString())) { + if (projectBudgetIncomeDetail.getTaxRate() != null && !rates.contains(projectBudgetIncomeDetail.getTaxRate().toPlainString())) { incomeTaxSb.append(projectBudgetIncomeDetail.getTaxRate().toPlainString()).append("%,"); rates.add(projectBudgetIncomeDetail.getTaxRate().toPlainString()); } @@ -392,7 +392,7 @@ public class ProjectController extends BaseController { Set rates2 = new HashSet<>(); StringBuilder costTaxSb = new StringBuilder(); for (ProjectBudgetCostDetail projectBudgetCostDetail : budgetCostDetail) { - if (!rates2.contains(projectBudgetCostDetail.getTaxRate().toPlainString())) { + if (projectBudgetCostDetail.getTaxRate() != null && !rates2.contains(projectBudgetCostDetail.getTaxRate().toPlainString())) { costTaxSb.append(projectBudgetCostDetail.getTaxRate().toPlainString()).append("%,"); rates2.add(projectBudgetCostDetail.getTaxRate().toPlainString()); } @@ -701,7 +701,7 @@ public class ProjectController extends BaseController { Set rates = new HashSet<>(); StringBuilder incomeTaxSb = new StringBuilder(); for (ProjectBudgetIncomeDetail projectBudgetIncomeDetail : budgetIncomeDetail) { - if (!rates.contains(projectBudgetIncomeDetail.getTaxRate().toPlainString())) { + if (projectBudgetIncomeDetail.getTaxRate() != null && !rates.contains(projectBudgetIncomeDetail.getTaxRate().toPlainString())) { incomeTaxSb.append(projectBudgetIncomeDetail.getTaxRate().toPlainString()).append("%,"); rates.add(projectBudgetIncomeDetail.getTaxRate().toPlainString()); } @@ -715,7 +715,7 @@ public class ProjectController extends BaseController { Set rates2 = new HashSet<>(); StringBuilder costTaxSb = new StringBuilder(); for (ProjectBudgetCostDetail projectBudgetCostDetail : budgetCostDetail) { - if (!rates2.contains(projectBudgetCostDetail.getTaxRate().toPlainString())) { + if (projectBudgetCostDetail.getTaxRate() != null && !rates2.contains(projectBudgetCostDetail.getTaxRate().toPlainString())) { costTaxSb.append(projectBudgetCostDetail.getTaxRate().toPlainString()).append("%,"); rates2.add(projectBudgetCostDetail.getTaxRate().toPlainString()); } diff --git a/src/main/java/cn/palmte/work/model/ProjectBudgetCostDetailBase.java b/src/main/java/cn/palmte/work/model/ProjectBudgetCostDetailBase.java index 39012b2..324a4bc 100644 --- a/src/main/java/cn/palmte/work/model/ProjectBudgetCostDetailBase.java +++ b/src/main/java/cn/palmte/work/model/ProjectBudgetCostDetailBase.java @@ -188,14 +188,16 @@ public class ProjectBudgetCostDetailBase { public BigDecimal getTotalTaxInclude(){ if(null == price){ - return null; + return BigDecimal.ZERO; } return price.multiply(amount); } public BigDecimal getTotalTaxExclude(){ BigDecimal totalTaxInclude = getTotalTaxInclude(); - if(null == totalTaxInclude || taxRate == null){ - return null; + if(null == totalTaxInclude) { + return BigDecimal.ZERO; + } else if (taxRate == null){ + return totalTaxInclude; } //不含税总金额=含税总金额/（1+税率） @@ -205,7 +207,7 @@ public class ProjectBudgetCostDetailBase { public BigDecimal getTotalTax(){ BigDecimal totalTaxInclude = getTotalTaxInclude(); if(null == totalTaxInclude || taxRate == null){ - return null; + return BigDecimal.ZERO; } //不含税总金额=含税总金额/（1+税率） diff --git a/src/main/java/cn/palmte/work/model/ProjectBudgetCostProjectManageDetailBase.java b/src/main/java/cn/palmte/work/model/ProjectBudgetCostProjectManageDetailBase.java index 23d4364..5e79181 100644 --- a/src/main/java/cn/palmte/work/model/ProjectBudgetCostProjectManageDetailBase.java +++ b/src/main/java/cn/palmte/work/model/ProjectBudgetCostProjectManageDetailBase.java @@ -162,7 +162,7 @@ public class ProjectBudgetCostProjectManageDetailBase { public BigDecimal getTotal(){ if(null == price){ - return null; + return BigDecimal.ZERO; } return price.multiply(amount); } diff --git a/src/main/java/cn/palmte/work/model/ProjectBudgetIncomeDetailBase.java b/src/main/java/cn/palmte/work/model/ProjectBudgetIncomeDetailBase.java index 4b24d21..a6bdbe4 100644 --- a/src/main/java/cn/palmte/work/model/ProjectBudgetIncomeDetailBase.java +++ b/src/main/java/cn/palmte/work/model/ProjectBudgetIncomeDetailBase.java @@ -131,14 +131,16 @@ public class ProjectBudgetIncomeDetailBase { public BigDecimal getTotalTaxInclude(){ if(null == price){ - return null; + return BigDecimal.ZERO; } return price.multiply(amount); } public BigDecimal getTotalTaxExclude(){ BigDecimal totalTaxInclude = getTotalTaxInclude(); - if(null == totalTaxInclude || taxRate == null){ - return null; + if(null == totalTaxInclude) { + return BigDecimal.ZERO; + } else if (taxRate == null){ + return totalTaxInclude; } //不含税总金额=含税总金额/（1+税率） @@ -149,7 +151,7 @@ public class ProjectBudgetIncomeDetailBase { public BigDecimal getTotalTax(){ BigDecimal totalTaxInclude = getTotalTaxInclude(); if(null == totalTaxInclude || taxRate == null){ - return null; + return BigDecimal.ZERO; } //不含税总金额=含税总金额/（1+税率）