From f86f6a96163a9d4f4c85c4489133fd1f4172c4e9 Mon Sep 17 00:00:00 2001 From: xxssyyyyssxx Date: Thu, 2 Dec 2021 18:14:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=94=E8=AF=A5=E5=8F=96=E5=90=AB=E7=A8=8E?= =?UTF-8?q?=E9=87=91=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../work/service/ProjectBudgetService.java | 6 ++--- .../static/assets/js/project_budget_plan.js | 26 +++++++++---------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/main/java/cn/palmte/work/service/ProjectBudgetService.java b/src/main/java/cn/palmte/work/service/ProjectBudgetService.java index ff5ccf9..2d75f44 100644 --- a/src/main/java/cn/palmte/work/service/ProjectBudgetService.java +++ b/src/main/java/cn/palmte/work/service/ProjectBudgetService.java @@ -574,7 +574,7 @@ public class ProjectBudgetService { BigDecimal saleIncome = new BigDecimal(0); if(CollectionUtil.isNotEmpty(budgetIncomeDetail)){ for (ProjectBudgetIncomeDetail projectBudgetIncomeDetail : budgetIncomeDetail) { - saleIncome = saleIncome.add(projectBudgetIncomeDetail.getTotalTaxExclude()); + saleIncome = saleIncome.add(projectBudgetIncomeDetail.getTotalTaxInclude()); } } return saleIncome; @@ -595,7 +595,7 @@ public class ProjectBudgetService { if(CollectionUtil.isNotEmpty(budgetCostDetail)){ List costDetailList = budgetCostDetail.stream().filter(b -> b.getType() != ProjectBudgetCostDetail.TYPE_DEVICE).collect(Collectors.toList()); for (ProjectBudgetCostDetail projectBudgetCostDetail : costDetailList) { - engineerCost = engineerCost.add(projectBudgetCostDetail.getTotalTaxExclude()); + engineerCost = engineerCost.add(projectBudgetCostDetail.getTotalTaxInclude()); } } return engineerCost; @@ -605,7 +605,7 @@ public class ProjectBudgetService { if(CollectionUtil.isNotEmpty(budgetCostDetail)){ List costDetailList = budgetCostDetail.stream().filter(b -> b.getType() == ProjectBudgetCostDetail.TYPE_DEVICE).collect(Collectors.toList()); for (ProjectBudgetCostDetail projectBudgetCostDetail : costDetailList) { - deviceCost = deviceCost.add(projectBudgetCostDetail.getTotalTaxExclude()); + deviceCost = deviceCost.add(projectBudgetCostDetail.getTotalTaxInclude()); } } return deviceCost; diff --git a/src/main/resources/static/assets/js/project_budget_plan.js b/src/main/resources/static/assets/js/project_budget_plan.js index 9acb190..7fafedd 100644 --- a/src/main/resources/static/assets/js/project_budget_plan.js +++ b/src/main/resources/static/assets/js/project_budget_plan.js @@ -60,12 +60,12 @@ function verifyBudgetPlan(){ } - var costPurchaseDeviceTaxExclude = inputVal("costPurchaseDeviceTaxExclude"); - var costPurchaseBuildTaxExclude = inputVal("costPurchaseBuildTaxExclude"); - var costPurchaseServiceTaxExclude = inputVal("costPurchaseServiceTaxExclude"); - var costPurchaseOtherTaxExclude = inputVal("costPurchaseOtherTaxExclude"); - var costProjectManageTaxExclude = inputVal("costProjectManageTaxExclude"); - var incomeTotalTaxExclude = inputVal("incomeTotalTaxExclude"); + var costPurchaseDeviceTaxInclude = inputVal("costPurchaseDeviceTaxInclude"); + var costPurchaseBuildTaxInclude = inputVal("costPurchaseBuildTaxInclude"); + var costPurchaseServiceTaxInclude = inputVal("costPurchaseServiceTaxInclude"); + var costPurchaseOtherTaxInclude = inputVal("costPurchaseOtherTaxInclude"); + var costProjectManageTaxInclude = inputVal("costProjectManageTaxInclude"); + var incomeTotalTaxInclude = inputVal("incomeTotalTaxInclude"); var input_total_device_cost_budget_plan = classVal("input-total-device-cost-budget-plan"); var input_total_engineer_cost_budget_plan = classVal("input-total-engineer-cost-budget-plan"); var input_total_project_manage_budget_plan = classVal("input-total-project-manage-cost-budget-plan"); @@ -75,21 +75,21 @@ function verifyBudgetPlan(){ //从采购成本明细中取“设备”大类下的总计---设备支出 - if(costPurchaseDeviceTaxExclude != input_total_device_cost_budget_plan){ - return "采购成本明细中取“设备”大类下的总计["+costPurchaseDeviceTaxExclude+"]与设备支出["+input_total_device_cost_budget_plan+"]不等"; + if(costPurchaseDeviceTaxInclude != input_total_device_cost_budget_plan){ + return "采购成本明细中取“设备”大类下的总计["+costPurchaseDeviceTaxInclude+"]与设备支出["+input_total_device_cost_budget_plan+"]不等"; } //从采购成本明细中取“服务+施工+其他”大类的总计---工程支出 - var t = f2(f2(costPurchaseBuildTaxExclude)+f2(costPurchaseServiceTaxExclude)+f2(costPurchaseOtherTaxExclude)); + var t = f2(f2(costPurchaseBuildTaxInclude)+f2(costPurchaseServiceTaxInclude)+f2(costPurchaseOtherTaxInclude)); if(t != f2(input_total_engineer_cost_budget_plan)){ return "采购成本明细中取“服务+施工+其他”大类的总计["+t+"]与工程支出["+input_total_engineer_cost_budget_plan+"]不等"; } //从项目管理成本取总计金额--经营性开支 - if(costProjectManageTaxExclude != input_total_project_manage_budget_plan){ - return "项目管理成本取总计金额["+costProjectManageTaxExclude+"]与经营性开支["+input_total_project_manage_budget_plan+"]不等"; + if(costProjectManageTaxInclude != input_total_project_manage_budget_plan){ + return "项目管理成本取总计金额["+costProjectManageTaxInclude+"]与经营性开支["+input_total_project_manage_budget_plan+"]不等"; } //从“销售收入明细”中取合计--销售收款 - if(incomeTotalTaxExclude != input_total_sale_income_budget_plan){ - return "销售收入明细金额["+incomeTotalTaxExclude+"]与销售收款["+input_total_sale_income_budget_plan+"]不等"; + if(incomeTotalTaxInclude != input_total_sale_income_budget_plan){ + return "销售收入明细金额["+incomeTotalTaxInclude+"]与销售收款["+input_total_sale_income_budget_plan+"]不等"; } //保证金支出和收入一致 if(input_total_earnest_money_cost_budget_plan != input_total_earnest_money_income_budget_plan){