From dedf9ef7bb606d610da8f90c9b5c451f3a693074 Mon Sep 17 00:00:00 2001 From: hanbo <2608504783@qq.com> Date: Thu, 18 Nov 2021 10:35:10 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E7=AE=97=E8=BF=94=E5=9B=9E=E5=80=BC?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../work/bean/PrimaryIndicatorBean.java | 24 ++-- .../ProjectBudgetCostManageRepository.java | 3 +- .../model/ProjectBudgetCostRepository.java | 5 +- .../model/ProjectBudgetIncomeRepository.java | 5 +- .../ProjectSettleCashFlowRepository.java | 3 +- .../ProjectSettleCostManageRepository.java | 3 +- .../model/ProjectSettleCostRepository.java | 3 +- .../model/ProjectSettleIncomeRepository.java | 3 +- .../work/service/ProjectFinalSevice.java | 104 +++++++++--------- .../work/service/StatisticsService.java | 43 ++++---- .../templates/admin/project_final_edit.ftl | 2 +- 11 files changed, 105 insertions(+), 93 deletions(-) diff --git a/src/main/java/cn/palmte/work/bean/PrimaryIndicatorBean.java b/src/main/java/cn/palmte/work/bean/PrimaryIndicatorBean.java index 2a9d9a9..19c2af0 100644 --- a/src/main/java/cn/palmte/work/bean/PrimaryIndicatorBean.java +++ b/src/main/java/cn/palmte/work/bean/PrimaryIndicatorBean.java @@ -2,6 +2,8 @@ package cn.palmte.work.bean; import lombok.Data; +import java.math.BigDecimal; + /** * 主要指标数据 */ @@ -16,56 +18,56 @@ public class PrimaryIndicatorBean { /** * 收入--设备类 */ - private long incomeDevice; + private BigDecimal incomeDevice; /** * 收入--施工类 */ - private long incomeEngineer; + private BigDecimal incomeEngineer; /** * 收入--服务类 */ - private long incomeService; + private BigDecimal incomeService; /** * 采购成本--设备类 */ - private long costPurchaseDevice; + private BigDecimal costPurchaseDevice; /** * 采购成本--施工类 */ - private long costPurchaseBuild; + private BigDecimal costPurchaseBuild; /** * 采购成本--服务类 */ - private long costPurchaseService; + private BigDecimal costPurchaseService; /** * 采购成本--其他 */ - private long costPurchaseOther; + private BigDecimal costPurchaseOther; /** * 成本--其他 */ - private long costOtherOther; + private BigDecimal costOtherOther; /** * 成本--项目管理成本 */ - private long costProjectManage; + private BigDecimal costProjectManage; /** * 财务费用--资金占用成本 */ - private long costExpropriation; + private BigDecimal costExpropriation; /** * 公司管理费用 */ - private long costCompanyManage; + private BigDecimal costCompanyManage; } diff --git a/src/main/java/cn/palmte/work/model/ProjectBudgetCostManageRepository.java b/src/main/java/cn/palmte/work/model/ProjectBudgetCostManageRepository.java index 305e1f9..9b87d06 100644 --- a/src/main/java/cn/palmte/work/model/ProjectBudgetCostManageRepository.java +++ b/src/main/java/cn/palmte/work/model/ProjectBudgetCostManageRepository.java @@ -3,12 +3,13 @@ package cn.palmte.work.model; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; +import java.math.BigDecimal; import java.util.List; public interface ProjectBudgetCostManageRepository extends JpaRepository { List findAllByProjectIdEquals(int id); @Query(value = "select sum(cost_tax_exclude) from project_budget_cost_manage where type = ?", nativeQuery = true) - long costTaxExcludeSum(int type); + BigDecimal costTaxExcludeSum(int type); } diff --git a/src/main/java/cn/palmte/work/model/ProjectBudgetCostRepository.java b/src/main/java/cn/palmte/work/model/ProjectBudgetCostRepository.java index 35c14d4..6972eb1 100644 --- a/src/main/java/cn/palmte/work/model/ProjectBudgetCostRepository.java +++ b/src/main/java/cn/palmte/work/model/ProjectBudgetCostRepository.java @@ -3,15 +3,16 @@ package cn.palmte.work.model; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; +import java.math.BigDecimal; import java.util.List; public interface ProjectBudgetCostRepository extends JpaRepository { List findAllByProjectIdEquals(int id); @Query(value = "select sum(cost_tax_include) from project_budget_cost where type = ?", nativeQuery = true) - long costTaxIncludeSum(int type); + BigDecimal costTaxIncludeSum(int type); @Query(value = "select sum(cost_tax_exclude) from project_budget_cost where type = ?", nativeQuery = true) - long costTaxExcludeSum(int type); + BigDecimal costTaxExcludeSum(int type); } diff --git a/src/main/java/cn/palmte/work/model/ProjectBudgetIncomeRepository.java b/src/main/java/cn/palmte/work/model/ProjectBudgetIncomeRepository.java index 0842139..57131fc 100644 --- a/src/main/java/cn/palmte/work/model/ProjectBudgetIncomeRepository.java +++ b/src/main/java/cn/palmte/work/model/ProjectBudgetIncomeRepository.java @@ -3,16 +3,17 @@ package cn.palmte.work.model; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; +import java.math.BigDecimal; import java.util.List; public interface ProjectBudgetIncomeRepository extends JpaRepository { List findAllByProjectIdEquals(int id); @Query(value = "select sum(income_tax_include) from project_budget_income where type = ?", nativeQuery = true) - long incomeTaxIncludeSum(int type); + BigDecimal incomeTaxIncludeSum(int type); @Query(value = "select sum(income_tax_exclude) from project_budget_income where type = ?", nativeQuery = true) - long incomeTaxExcludeSum(int type); + BigDecimal incomeTaxExcludeSum(int type); } diff --git a/src/main/java/cn/palmte/work/model/ProjectSettleCashFlowRepository.java b/src/main/java/cn/palmte/work/model/ProjectSettleCashFlowRepository.java index 666ef11..3be0894 100644 --- a/src/main/java/cn/palmte/work/model/ProjectSettleCashFlowRepository.java +++ b/src/main/java/cn/palmte/work/model/ProjectSettleCashFlowRepository.java @@ -3,6 +3,7 @@ package cn.palmte.work.model; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; +import java.math.BigDecimal; import java.util.List; /** @@ -21,5 +22,5 @@ public interface ProjectSettleCashFlowRepository extends JpaRepository findAllByTime(String time); @Query(value = "select sum(amount) from project_settle_cash_flow where project_id = ? and type = ?", nativeQuery = true) - long costAmountSum(int projectId,int type); + BigDecimal costAmountSum(int projectId, int type); } diff --git a/src/main/java/cn/palmte/work/model/ProjectSettleCostManageRepository.java b/src/main/java/cn/palmte/work/model/ProjectSettleCostManageRepository.java index e81624a..10e2320 100644 --- a/src/main/java/cn/palmte/work/model/ProjectSettleCostManageRepository.java +++ b/src/main/java/cn/palmte/work/model/ProjectSettleCostManageRepository.java @@ -3,6 +3,7 @@ package cn.palmte.work.model; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; +import java.math.BigDecimal; import java.util.List; /** @@ -17,7 +18,7 @@ public interface ProjectSettleCostManageRepository extends JpaRepository findAllByProjectIdBefore(int id, String time); @Query(value = "select sum(cost_tax_exclude) from project_settle_cost_manage where project_id = ? and type = ?", nativeQuery = true) - long costTaxExcludeSum(int projectId,int type); + BigDecimal costTaxExcludeSum(int projectId, int type); List findAllByProjectId(int id); diff --git a/src/main/java/cn/palmte/work/model/ProjectSettleCostRepository.java b/src/main/java/cn/palmte/work/model/ProjectSettleCostRepository.java index 6ec3581..9915527 100644 --- a/src/main/java/cn/palmte/work/model/ProjectSettleCostRepository.java +++ b/src/main/java/cn/palmte/work/model/ProjectSettleCostRepository.java @@ -3,6 +3,7 @@ package cn.palmte.work.model; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; +import java.math.BigDecimal; import java.util.List; /** @@ -17,7 +18,7 @@ public interface ProjectSettleCostRepository extends JpaRepository findAllByProjectIdBefore(int id, String time); @Query(value = "select sum(cost_tax_exclude) from project_settle_cost where project_id = ? and type = ?", nativeQuery = true) - long costTaxExcludeSum(int projectId,int type); + BigDecimal costTaxExcludeSum(int projectId, int type); List findAllByProjectId(int id); diff --git a/src/main/java/cn/palmte/work/model/ProjectSettleIncomeRepository.java b/src/main/java/cn/palmte/work/model/ProjectSettleIncomeRepository.java index 8ea5ab1..84e637a 100644 --- a/src/main/java/cn/palmte/work/model/ProjectSettleIncomeRepository.java +++ b/src/main/java/cn/palmte/work/model/ProjectSettleIncomeRepository.java @@ -3,6 +3,7 @@ package cn.palmte.work.model; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; +import java.math.BigDecimal; import java.util.List; /** @@ -17,7 +18,7 @@ public interface ProjectSettleIncomeRepository extends JpaRepository findAllByProjectIdBefore(int id, String time); @Query(value = "select sum(income_tax_exclude) from project_settle_income where project_id = ? and type = ?", nativeQuery = true) - long incomeTaxExcludeSum(int projectId,int type); + BigDecimal incomeTaxExcludeSum(int projectId, int type); List findAllByProjectId(int id); diff --git a/src/main/java/cn/palmte/work/service/ProjectFinalSevice.java b/src/main/java/cn/palmte/work/service/ProjectFinalSevice.java index 708ee9f..cb43d38 100644 --- a/src/main/java/cn/palmte/work/service/ProjectFinalSevice.java +++ b/src/main/java/cn/palmte/work/service/ProjectFinalSevice.java @@ -408,65 +408,65 @@ public class ProjectFinalSevice { public SettleBean getSettle(Project project) { SettleBean settleBean = new SettleBean(); - long incomeDivice = projectSettleIncomeRepository.incomeTaxExcludeSum(project.getId(), ProjectSettleIncome.TYPE_DEVICE); - long incomeEngineer = projectSettleIncomeRepository.incomeTaxExcludeSum(project.getId(), ProjectSettleIncome.TYPE_ENGINEER); - long incomeService = projectSettleIncomeRepository.incomeTaxExcludeSum(project.getId(), ProjectSettleIncome.TYPE_SERVICE); + BigDecimal incomeDivice = projectSettleIncomeRepository.incomeTaxExcludeSum(project.getId(), ProjectSettleIncome.TYPE_DEVICE); + BigDecimal incomeEngineer = projectSettleIncomeRepository.incomeTaxExcludeSum(project.getId(), ProjectSettleIncome.TYPE_ENGINEER); + BigDecimal incomeService = projectSettleIncomeRepository.incomeTaxExcludeSum(project.getId(), ProjectSettleIncome.TYPE_SERVICE); - settleBean.setIncomeDevice(new BigDecimal(incomeDivice)); - settleBean.setIncomeEngineer(new BigDecimal(incomeEngineer)); - settleBean.setIncomeService(new BigDecimal(incomeService)); + settleBean.setIncomeDevice(incomeDivice); + settleBean.setIncomeEngineer(incomeEngineer); + settleBean.setIncomeService(incomeService); - long costDevice = projectSettleCostRepository.costTaxExcludeSum(project.getId(), ProjectSettleCost.TYPE_DEVICE); - long costBuilding = projectSettleCostRepository.costTaxExcludeSum(project.getId(), ProjectSettleCost.TYPE_BUILDING); - long costService = projectSettleCostRepository.costTaxExcludeSum(project.getId(), ProjectSettleCost.TYPE_SERVICE); - long costOther = projectSettleCostRepository.costTaxExcludeSum(project.getId(), ProjectSettleCost.TYPE_OTHER); - long costProjectManage = projectSettleCostRepository.costTaxExcludeSum(project.getId(), ProjectSettleCost.TYPE_PROJECT_MANAGE); - long costOtherOther = projectSettleCostRepository.costTaxExcludeSum(project.getId(), ProjectSettleCost.TYPE_OTHER_OTHER); + BigDecimal costDevice = projectSettleCostRepository.costTaxExcludeSum(project.getId(), ProjectSettleCost.TYPE_DEVICE); + BigDecimal costBuilding = projectSettleCostRepository.costTaxExcludeSum(project.getId(), ProjectSettleCost.TYPE_BUILDING); + BigDecimal costService = projectSettleCostRepository.costTaxExcludeSum(project.getId(), ProjectSettleCost.TYPE_SERVICE); + BigDecimal costOther = projectSettleCostRepository.costTaxExcludeSum(project.getId(), ProjectSettleCost.TYPE_OTHER); + BigDecimal costProjectManage = projectSettleCostRepository.costTaxExcludeSum(project.getId(), ProjectSettleCost.TYPE_PROJECT_MANAGE); + BigDecimal costOtherOther = projectSettleCostRepository.costTaxExcludeSum(project.getId(), ProjectSettleCost.TYPE_OTHER_OTHER); - settleBean.setCostPurchaseDevice(new BigDecimal(costDevice)); - settleBean.setCostPurchaseBuild(new BigDecimal(costBuilding)); - settleBean.setCostPurchaseService(new BigDecimal(costService)); - settleBean.setCostOther(new BigDecimal(costOther)); - settleBean.setCostProjectManage(new BigDecimal(costProjectManage)); - settleBean.setCostPurchaseOther(new BigDecimal(costOtherOther)); + settleBean.setCostPurchaseDevice(costDevice); + settleBean.setCostPurchaseBuild(costBuilding); + settleBean.setCostPurchaseService(costService); + settleBean.setCostOther(costOther); + settleBean.setCostProjectManage(costProjectManage); + settleBean.setCostPurchaseOther(costOtherOther); - long costExpropriation = projectSettleCostManageRepository.costTaxExcludeSum(project.getId(), ProjectSettleCostManage.TYPE_EXPROPRIATION); - long costCompanyMange = projectSettleCostManageRepository.costTaxExcludeSum(project.getId(), ProjectSettleCostManage.TYPE_COMPANY_MANAGE); - long costIncomeTax = projectSettleCostManageRepository.costTaxExcludeSum(project.getId(), ProjectSettleCostManage.TYPE_INCOME_TAX); + BigDecimal costExpropriation = projectSettleCostManageRepository.costTaxExcludeSum(project.getId(), ProjectSettleCostManage.TYPE_EXPROPRIATION); + BigDecimal costCompanyMange = projectSettleCostManageRepository.costTaxExcludeSum(project.getId(), ProjectSettleCostManage.TYPE_COMPANY_MANAGE); + BigDecimal costIncomeTax = projectSettleCostManageRepository.costTaxExcludeSum(project.getId(), ProjectSettleCostManage.TYPE_INCOME_TAX); - settleBean.setCostExpropriation(new BigDecimal(costExpropriation)); - settleBean.setCostCompanyManage(new BigDecimal(costCompanyMange)); - settleBean.setCostIncomeTax(new BigDecimal(costIncomeTax)); + settleBean.setCostExpropriation(costExpropriation); + settleBean.setCostCompanyManage(costCompanyMange); + settleBean.setCostIncomeTax(costIncomeTax); - long type1 = projectSettleCashFlowRepository.costAmountSum(project.getId(), ProjectSettleCashFlow.SALE_INCOME_CASH); - long type2 = projectSettleCashFlowRepository.costAmountSum(project.getId(), ProjectSettleCashFlow.TAX_RETURN); - long type3 = projectSettleCashFlowRepository.costAmountSum(project.getId(), ProjectSettleCashFlow.EARNEST_MONEY_INCOME); - long type4 = projectSettleCashFlowRepository.costAmountSum(project.getId(), ProjectSettleCashFlow.PURCHASE_COST); - long type5 = projectSettleCashFlowRepository.costAmountSum(project.getId(), ProjectSettleCashFlow.TAX_COST); - long type6 = projectSettleCashFlowRepository.costAmountSum(project.getId(), ProjectSettleCashFlow.EARNEST_MONEY_COST); - long type7 = projectSettleCashFlowRepository.costAmountSum(project.getId(), ProjectSettleCashFlow.NET_CASH_FLOW); - long type8 = projectSettleCashFlowRepository.costAmountSum(project.getId(), ProjectSettleCashFlow.CASH_INFLOW_FROM_INVESTING_ACTIVITIES); - long type9 = projectSettleCashFlowRepository.costAmountSum(project.getId(), ProjectSettleCashFlow.CASH_OUTFLOW_FROM_INVESTING_ACTIVITIES); - long type10 = projectSettleCashFlowRepository.costAmountSum(project.getId(), ProjectSettleCashFlow.NET_CASH_FROM_INVESTING_ACTIVITIES); - long type11 = projectSettleCashFlowRepository.costAmountSum(project.getId(), ProjectSettleCashFlow.FINANCING_CAPITAL_INFLOW); - long type12 = projectSettleCashFlowRepository.costAmountSum(project.getId(), ProjectSettleCashFlow.FINANCING_CAPITAL_OUTFLOW); - long type13 = projectSettleCashFlowRepository.costAmountSum(project.getId(), ProjectSettleCashFlow.FINANCING_CAPITAL_CASHFLOW); - long type14 = projectSettleCashFlowRepository.costAmountSum(project.getId(), ProjectSettleCashFlow.NET_INCREASE_MONETARY_FUNDS); + BigDecimal type1 = projectSettleCashFlowRepository.costAmountSum(project.getId(), ProjectSettleCashFlow.SALE_INCOME_CASH); + BigDecimal type2 = projectSettleCashFlowRepository.costAmountSum(project.getId(), ProjectSettleCashFlow.TAX_RETURN); + BigDecimal type3 = projectSettleCashFlowRepository.costAmountSum(project.getId(), ProjectSettleCashFlow.EARNEST_MONEY_INCOME); + BigDecimal type4 = projectSettleCashFlowRepository.costAmountSum(project.getId(), ProjectSettleCashFlow.PURCHASE_COST); + BigDecimal type5 = projectSettleCashFlowRepository.costAmountSum(project.getId(), ProjectSettleCashFlow.TAX_COST); + BigDecimal type6 = projectSettleCashFlowRepository.costAmountSum(project.getId(), ProjectSettleCashFlow.EARNEST_MONEY_COST); + BigDecimal type7 = projectSettleCashFlowRepository.costAmountSum(project.getId(), ProjectSettleCashFlow.NET_CASH_FLOW); + BigDecimal type8 = projectSettleCashFlowRepository.costAmountSum(project.getId(), ProjectSettleCashFlow.CASH_INFLOW_FROM_INVESTING_ACTIVITIES); + BigDecimal type9 = projectSettleCashFlowRepository.costAmountSum(project.getId(), ProjectSettleCashFlow.CASH_OUTFLOW_FROM_INVESTING_ACTIVITIES); + BigDecimal type10 = projectSettleCashFlowRepository.costAmountSum(project.getId(), ProjectSettleCashFlow.NET_CASH_FROM_INVESTING_ACTIVITIES); + BigDecimal type11 = projectSettleCashFlowRepository.costAmountSum(project.getId(), ProjectSettleCashFlow.FINANCING_CAPITAL_INFLOW); + BigDecimal type12 = projectSettleCashFlowRepository.costAmountSum(project.getId(), ProjectSettleCashFlow.FINANCING_CAPITAL_OUTFLOW); + BigDecimal type13 = projectSettleCashFlowRepository.costAmountSum(project.getId(), ProjectSettleCashFlow.FINANCING_CAPITAL_CASHFLOW); + BigDecimal type14 = projectSettleCashFlowRepository.costAmountSum(project.getId(), ProjectSettleCashFlow.NET_INCREASE_MONETARY_FUNDS); - settleBean.setSaleIncomeCash(new BigDecimal(type1)); - settleBean.setTaxReturn(new BigDecimal(type2)); - settleBean.setEarnestMoneyIncome(new BigDecimal(type3)); - settleBean.setPurchaseCost(new BigDecimal(type4)); - settleBean.setTaxCost(new BigDecimal(type5)); - settleBean.setEarnestMoneyCost(new BigDecimal(type6)); - settleBean.setNetCashFlow(new BigDecimal(type7)); - settleBean.setCashInflowFromInvestingActivities(new BigDecimal(type8)); - settleBean.setCashOutflowFromInvestingActivities(new BigDecimal(type9)); - settleBean.setNetCashFromInvestingActivities(new BigDecimal(type10)); - settleBean.setFinancingCapitalInflow(new BigDecimal(type11)); - settleBean.setFinancingCapitalOutflow(new BigDecimal(type12)); - settleBean.setFinancingCapitalCashflow(new BigDecimal(type13)); - settleBean.setNetIncreaseMonetaryFunds(new BigDecimal(type14)); + settleBean.setSaleIncomeCash(type1); + settleBean.setTaxReturn(type2); + settleBean.setEarnestMoneyIncome(type3); + settleBean.setPurchaseCost(type4); + settleBean.setTaxCost(type5); + settleBean.setEarnestMoneyCost(type6); + settleBean.setNetCashFlow(type7); + settleBean.setCashInflowFromInvestingActivities(type8); + settleBean.setCashOutflowFromInvestingActivities(type9); + settleBean.setNetCashFromInvestingActivities(type10); + settleBean.setFinancingCapitalInflow(type11); + settleBean.setFinancingCapitalOutflow(type12); + settleBean.setFinancingCapitalCashflow(type13); + settleBean.setNetIncreaseMonetaryFunds(type14); return settleBean; } } diff --git a/src/main/java/cn/palmte/work/service/StatisticsService.java b/src/main/java/cn/palmte/work/service/StatisticsService.java index 56a5ca2..b26568c 100644 --- a/src/main/java/cn/palmte/work/service/StatisticsService.java +++ b/src/main/java/cn/palmte/work/service/StatisticsService.java @@ -5,6 +5,7 @@ import cn.palmte.work.model.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; @@ -30,21 +31,21 @@ public class StatisticsService { PrimaryIndicatorBean include = new PrimaryIndicatorBean(); include.setTitle("预算金额（含税）"); //收入数据 - long deviceIncomeTaxIncludeSum = projectBudgetIncomeRepository.incomeTaxIncludeSum(ProjectBudgetIncome.TYPE_DEVICE); - long engineerIncomeTaxIncludeSum = projectBudgetIncomeRepository.incomeTaxIncludeSum(ProjectBudgetIncome.TYPE_ENGINEER); - long serviceIncomeTaxIncludeSum = projectBudgetIncomeRepository.incomeTaxIncludeSum(ProjectBudgetIncome.TYPE_SERVICE); + BigDecimal deviceIncomeTaxIncludeSum = projectBudgetIncomeRepository.incomeTaxIncludeSum(ProjectBudgetIncome.TYPE_DEVICE); + BigDecimal engineerIncomeTaxIncludeSum = projectBudgetIncomeRepository.incomeTaxIncludeSum(ProjectBudgetIncome.TYPE_ENGINEER); + BigDecimal serviceIncomeTaxIncludeSum = projectBudgetIncomeRepository.incomeTaxIncludeSum(ProjectBudgetIncome.TYPE_SERVICE); include.setIncomeDevice(deviceIncomeTaxIncludeSum); include.setIncomeEngineer(engineerIncomeTaxIncludeSum); include.setIncomeService(serviceIncomeTaxIncludeSum); //成本 - long deviceCostTaxIncludeSum = projectBudgetCostRepository.costTaxIncludeSum(ProjectBudgetCost.TYPE_DEVICE); - long buildingCostTaxIncludeSum = projectBudgetCostRepository.costTaxIncludeSum(ProjectBudgetCost.TYPE_BUILDING); - long serviceCostTaxIncludeSum = projectBudgetCostRepository.costTaxIncludeSum(ProjectBudgetCost.TYPE_SERVICE); - long otherCostTaxIncludeSum = projectBudgetCostRepository.costTaxIncludeSum(ProjectBudgetCost.TYPE_OTHER); - long projectManageCostTaxIncludeSum = projectBudgetCostRepository.costTaxIncludeSum(ProjectBudgetCost.TYPE_PROJECT_MANAGE); - long otherOtherCostTaxIncludeSum = projectBudgetCostRepository.costTaxIncludeSum(ProjectBudgetCost.TYPE_OTHER_OTHER); + BigDecimal deviceCostTaxIncludeSum = projectBudgetCostRepository.costTaxIncludeSum(ProjectBudgetCost.TYPE_DEVICE); + BigDecimal buildingCostTaxIncludeSum = projectBudgetCostRepository.costTaxIncludeSum(ProjectBudgetCost.TYPE_BUILDING); + BigDecimal serviceCostTaxIncludeSum = projectBudgetCostRepository.costTaxIncludeSum(ProjectBudgetCost.TYPE_SERVICE); + BigDecimal otherCostTaxIncludeSum = projectBudgetCostRepository.costTaxIncludeSum(ProjectBudgetCost.TYPE_OTHER); + BigDecimal projectManageCostTaxIncludeSum = projectBudgetCostRepository.costTaxIncludeSum(ProjectBudgetCost.TYPE_PROJECT_MANAGE); + BigDecimal otherOtherCostTaxIncludeSum = projectBudgetCostRepository.costTaxIncludeSum(ProjectBudgetCost.TYPE_OTHER_OTHER); include.setCostPurchaseDevice(deviceCostTaxIncludeSum); include.setCostPurchaseBuild(buildingCostTaxIncludeSum); @@ -58,21 +59,21 @@ public class StatisticsService { PrimaryIndicatorBean exclude = new PrimaryIndicatorBean(); exclude.setTitle("预算金额（不含税）"); //收入数据 - long deviceIncomeTaxExcludeSum = projectBudgetIncomeRepository.incomeTaxExcludeSum(ProjectBudgetIncome.TYPE_DEVICE); - long engineerIncomeTaxExcludeSum = projectBudgetIncomeRepository.incomeTaxExcludeSum(ProjectBudgetIncome.TYPE_ENGINEER); - long serviceIncomeTaxExcludeSum = projectBudgetIncomeRepository.incomeTaxExcludeSum(ProjectBudgetIncome.TYPE_SERVICE); + BigDecimal deviceIncomeTaxExcludeSum = projectBudgetIncomeRepository.incomeTaxExcludeSum(ProjectBudgetIncome.TYPE_DEVICE); + BigDecimal engineerIncomeTaxExcludeSum = projectBudgetIncomeRepository.incomeTaxExcludeSum(ProjectBudgetIncome.TYPE_ENGINEER); + BigDecimal serviceIncomeTaxExcludeSum = projectBudgetIncomeRepository.incomeTaxExcludeSum(ProjectBudgetIncome.TYPE_SERVICE); exclude.setIncomeDevice(deviceIncomeTaxExcludeSum); exclude.setIncomeEngineer(engineerIncomeTaxExcludeSum); exclude.setIncomeService(serviceIncomeTaxExcludeSum); //成本 - long deviceCostTaxExcludeSum = projectBudgetCostRepository.costTaxExcludeSum(ProjectBudgetCost.TYPE_DEVICE); - long buildingCostTaxExcludeSum = projectBudgetCostRepository.costTaxExcludeSum(ProjectBudgetCost.TYPE_BUILDING); - long serviceCostTaxExcludeSum = projectBudgetCostRepository.costTaxExcludeSum(ProjectBudgetCost.TYPE_SERVICE); - long otherCostTaxExcludeSum = projectBudgetCostRepository.costTaxExcludeSum(ProjectBudgetCost.TYPE_OTHER); - long projectManageCostTaxExcludeSum = projectBudgetCostRepository.costTaxExcludeSum(ProjectBudgetCost.TYPE_PROJECT_MANAGE); - long otherOtherCostTaxExcludeSum = projectBudgetCostRepository.costTaxExcludeSum(ProjectBudgetCost.TYPE_OTHER_OTHER); + BigDecimal deviceCostTaxExcludeSum = projectBudgetCostRepository.costTaxExcludeSum(ProjectBudgetCost.TYPE_DEVICE); + BigDecimal buildingCostTaxExcludeSum = projectBudgetCostRepository.costTaxExcludeSum(ProjectBudgetCost.TYPE_BUILDING); + BigDecimal serviceCostTaxExcludeSum = projectBudgetCostRepository.costTaxExcludeSum(ProjectBudgetCost.TYPE_SERVICE); + BigDecimal otherCostTaxExcludeSum = projectBudgetCostRepository.costTaxExcludeSum(ProjectBudgetCost.TYPE_OTHER); + BigDecimal projectManageCostTaxExcludeSum = projectBudgetCostRepository.costTaxExcludeSum(ProjectBudgetCost.TYPE_PROJECT_MANAGE); + BigDecimal otherOtherCostTaxExcludeSum = projectBudgetCostRepository.costTaxExcludeSum(ProjectBudgetCost.TYPE_OTHER_OTHER); exclude.setCostPurchaseDevice(deviceCostTaxExcludeSum); exclude.setCostPurchaseBuild(buildingCostTaxExcludeSum); @@ -82,12 +83,14 @@ public class StatisticsService { exclude.setCostOtherOther(otherOtherCostTaxExcludeSum); //管理 - long expropriationSum = projectBudgetCostManageRepository.costTaxExcludeSum(ProjectBudgetCostManage.TYPE_EXPROPRIATION); - long companyManageSum = projectBudgetCostManageRepository.costTaxExcludeSum(ProjectBudgetCostManage.TYPE_COMPANY_MANAGE); + BigDecimal expropriationSum = projectBudgetCostManageRepository.costTaxExcludeSum(ProjectBudgetCostManage.TYPE_EXPROPRIATION); + BigDecimal companyManageSum = projectBudgetCostManageRepository.costTaxExcludeSum(ProjectBudgetCostManage.TYPE_COMPANY_MANAGE); exclude.setCostExpropriation(expropriationSum); exclude.setCostCompanyManage(companyManageSum); + + list.add(exclude); return list; diff --git a/src/main/resources/templates/admin/project_final_edit.ftl b/src/main/resources/templates/admin/project_final_edit.ftl index a3bbdc5..4c397d5 100644 --- a/src/main/resources/templates/admin/project_final_edit.ftl +++ b/src/main/resources/templates/admin/project_final_edit.ftl @@ -336,7 +336,7 @@ 合计 - +