From e801d08232b14593e4bad54323fbe5c574fbaec9 Mon Sep 17 00:00:00 2001 From: hanbo <2608504783@qq.com> Date: Tue, 30 Nov 2021 16:03:20 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/admin/project_approve.ftl | 98 +++++++++---------- .../templates/admin/project_final_add.ftl | 2 +- .../templates/admin/project_final_edit.ftl | 2 +- 3 files changed, 51 insertions(+), 51 deletions(-) diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl index febf457..ab8caa5 100644 --- a/src/main/resources/templates/admin/project_approve.ftl +++ b/src/main/resources/templates/admin/project_approve.ftl @@ -877,7 +877,7 @@ - 现金流量表 + 结算现金流量表 @@ -1218,7 +1218,7 @@
- 现金流量表 + 决算现金流量表 @@ -1374,14 +1374,14 @@ - + <#----> <#if incomeDetails??> <#list incomeDetails as incomeDetail> - - - - - - + -->
税率（%） 含税总金额（元） 不含税金额（元）操作操作
- + <#-- -
- + <#---->
取消 @@ -1453,14 +1453,14 @@ 税率（%） 含税总金额（元） 不含税金额（元） - 操作 + <#--操作--> <#if costDetails??> <#list costDetails as costDetail> - - - - - - - - + --> @@ -1534,8 +1534,8 @@ - + <#---->
取消 @@ -1563,7 +1563,7 @@ 预估计算方法 预估依据 备注 - 操作 + <#--操作--> <#if costProjectManageDetails??> @@ -1588,48 +1588,48 @@ class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage" value="${costProjectManageDetail.name!}" <#if costProjectManageDetail.deletable==0>readonly> - - - - - - - - <#if costProjectManageDetail.deletable==1> + <#--<#if costProjectManageDetail.deletable==1> - + --> - + -->
取消 @@ -1660,7 +1660,7 @@ 资金利息 垫资计划 还款计划 - 操作 + <#-- 操作--> <#list projectBudgetPlanDetails as projectBudgetPlanDetail> - - - - - @@ -1741,10 +1741,10 @@ class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-total-cost-budget-plan" value="${Utils.format(projectBudgetPlanDetail.totalCost)}" readonly> - - @@ -1768,20 +1768,20 @@ class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-repayment-plan-budget-plan" value="${Utils.format(projectBudgetPlanDetail.repaymentPlan)}" readonly> - + <#-- - + --> - + --> diff --git a/src/main/resources/templates/admin/project_final_add.ftl b/src/main/resources/templates/admin/project_final_add.ftl index 1d5436d..084597d 100644 --- a/src/main/resources/templates/admin/project_final_add.ftl +++ b/src/main/resources/templates/admin/project_final_add.ftl @@ -240,7 +240,7 @@
- 现金流量表 + 决算现金流量表 diff --git a/src/main/resources/templates/admin/project_final_edit.ftl b/src/main/resources/templates/admin/project_final_edit.ftl index 42f71c7..4602ee1 100644 --- a/src/main/resources/templates/admin/project_final_edit.ftl +++ b/src/main/resources/templates/admin/project_final_edit.ftl @@ -240,7 +240,7 @@
- 现金流量表 + 决算现金流量表 From fd13368f4f0c17da8bd80219373a1bf3436ec861 Mon Sep 17 00:00:00 2001 From: hanbo <2608504783@qq.com> Date: Tue, 30 Nov 2021 16:14:12 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=88=86=E6=9C=88?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=9F=E8=AE=A1=E9=A1=B9=E7=9B=AE=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=88=90=E6=9C=AC=E4=B8=BA=E7=A9=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/cn/palmte/work/service/StatisticsService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/cn/palmte/work/service/StatisticsService.java b/src/main/java/cn/palmte/work/service/StatisticsService.java index bbe6da8..ed68ae0 100644 --- a/src/main/java/cn/palmte/work/service/StatisticsService.java +++ b/src/main/java/cn/palmte/work/service/StatisticsService.java @@ -95,14 +95,14 @@ public class StatisticsService { BigDecimal buildingCostTaxIncludeSum = allCost.stream().filter(d -> d.getType() == ProjectBudgetCost.TYPE_BUILDING).map(ProjectBudgetCost::getCostTaxInclude).reduce(BigDecimal.ZERO, BigDecimal::add); BigDecimal serviceCostTaxIncludeSum = allCost.stream().filter(d -> d.getType() == ProjectBudgetCost.TYPE_SERVICE).map(ProjectBudgetCost::getCostTaxInclude).reduce(BigDecimal.ZERO, BigDecimal::add); BigDecimal otherCostTaxIncludeSum = allCost.stream().filter(d -> d.getType() == ProjectBudgetCost.TYPE_OTHER).map(ProjectBudgetCost::getCostTaxInclude).reduce(BigDecimal.ZERO, BigDecimal::add); - BigDecimal projectManageCostTaxIncludeSum = allCost.stream().filter(d -> d.getType() == ProjectBudgetCost.TYPE_PROJECT_MANAGE).map(ProjectBudgetCost::getCostTaxInclude).reduce(BigDecimal.ZERO, BigDecimal::add); + //BigDecimal projectManageCostTaxIncludeSum = allCost.stream().filter(d -> d.getType() == ProjectBudgetCost.TYPE_PROJECT_MANAGE).map(ProjectBudgetCost::getCostTaxInclude).reduce(BigDecimal.ZERO, BigDecimal::add); BigDecimal otherOtherCostTaxIncludeSum = allCost.stream().filter(d -> d.getType() == ProjectBudgetCost.TYPE_OTHER_OTHER).map(ProjectBudgetCost::getCostTaxInclude).reduce(BigDecimal.ZERO, BigDecimal::add); include.setCostPurchaseDevice(deviceCostTaxIncludeSum); include.setCostPurchaseBuild(buildingCostTaxIncludeSum); include.setCostPurchaseService(serviceCostTaxIncludeSum); include.setCostPurchaseOther(otherCostTaxIncludeSum); - include.setCostProjectManage(projectManageCostTaxIncludeSum); + //include.setCostProjectManage(projectManageCostTaxIncludeSum); include.setCostOtherOther(otherOtherCostTaxIncludeSum); BigDecimal deviceCostTaxExcludeSum = allCost.stream().filter(d -> d.getType() == ProjectBudgetCost.TYPE_DEVICE).map(ProjectBudgetCost::getCostTaxExclude).reduce(BigDecimal.ZERO, BigDecimal::add); @@ -123,7 +123,7 @@ public class StatisticsService { BigDecimal costExclude = allCost.stream().filter(d -> d.getType() == ProjectBudgetCost.TYPE_DEVICE || d.getType() == ProjectBudgetCost.TYPE_BUILDING || d.getType() == ProjectBudgetCost.TYPE_SERVICE).map(ProjectBudgetCost::getCostTaxExclude).reduce(BigDecimal.ZERO, BigDecimal::add); profitAndLossBeanInclude.setCost(costInclude); - profitAndLossBeanInclude.setManageCost(projectManageCostTaxIncludeSum); + //profitAndLossBeanInclude.setManageCost(projectManageCostTaxIncludeSum); profitAndLossBeanInclude.setOther(otherCostTaxIncludeSum.add(otherOtherCostTaxIncludeSum)); profitAndLossBeanExclude.setCost(costExclude);