diff --git a/src/main/java/cn/palmte/work/bean/IncomeCostBean.java b/src/main/java/cn/palmte/work/bean/IncomeCostBean.java index b5bd7c6..270aece 100644 --- a/src/main/java/cn/palmte/work/bean/IncomeCostBean.java +++ b/src/main/java/cn/palmte/work/bean/IncomeCostBean.java @@ -18,7 +18,7 @@ public class IncomeCostBean { private BigDecimal costPurchaseDeviceTaxInclude; private BigDecimal costPurchaseBuildTaxInclude; private BigDecimal costPurchaseServiceTaxInclude; - private BigDecimal costProjectManageTaxInclude; + /*private BigDecimal costProjectManageTaxInclude;*/ private BigDecimal costPurchaseOtherTaxInclude; private BigDecimal costOtherOtherTaxInclude; @@ -120,13 +120,13 @@ public class IncomeCostBean { this.costPurchaseServiceTaxInclude = costPurchaseServiceTaxInclude; } - public BigDecimal getCostProjectManageTaxInclude() { + /*public BigDecimal getCostProjectManageTaxInclude() { return costProjectManageTaxInclude; } public void setCostProjectManageTaxInclude(BigDecimal costProjectManageTaxInclude) { this.costProjectManageTaxInclude = costProjectManageTaxInclude; - } + }*/ public BigDecimal getCostPurchaseOtherTaxInclude() { return costPurchaseOtherTaxInclude; diff --git a/src/main/java/cn/palmte/work/service/ProjectBudgetService.java b/src/main/java/cn/palmte/work/service/ProjectBudgetService.java index 1d878c4..43722ca 100644 --- a/src/main/java/cn/palmte/work/service/ProjectBudgetService.java +++ b/src/main/java/cn/palmte/work/service/ProjectBudgetService.java @@ -94,7 +94,7 @@ public class ProjectBudgetService { projectBudgetCostProject.setProjectId(project.getId()); projectBudgetCostProject.setFee(ProjectBudgetCost.FEE_PROJECT_MANAGE); projectBudgetCostProject.setType(ProjectBudgetCost.TYPE_PROJECT_MANAGE); - projectBudgetCostProject.setCostTaxInclude(budgetBean.getCostProjectManageTaxInclude()); + /*projectBudgetCostProject.setCostTaxInclude(budgetBean.getCostProjectManageTaxInclude());*/ projectBudgetCostProject.setCostTaxExclude(budgetBean.getCostProjectManageTaxExclude()); projectBudgetCostRepository.saveAndFlush(projectBudgetCostProject); @@ -185,7 +185,7 @@ public class ProjectBudgetService { budgetBean.setCostPurchaseOtherTaxExclude(projectBudgetCostOther.getCostTaxExclude()); ProjectBudgetCost projectBudgetCostProjectManage = costs.stream().filter(d -> d.getType() == ProjectBudgetCost.TYPE_PROJECT_MANAGE).collect(Collectors.toList()).get(0); - budgetBean.setCostProjectManageTaxInclude(projectBudgetCostProjectManage.getCostTaxInclude()); + /*budgetBean.setCostProjectManageTaxInclude(projectBudgetCostProjectManage.getCostTaxInclude());*/ budgetBean.setCostProjectManageTaxExclude(projectBudgetCostProjectManage.getCostTaxExclude()); ProjectBudgetCost projectBudgetCostOtherOther = costs.stream().filter(d -> d.getType() == ProjectBudgetCost.TYPE_OTHER_OTHER).collect(Collectors.toList()).get(0); diff --git a/src/main/java/cn/palmte/work/service/ProjectEstimateService.java b/src/main/java/cn/palmte/work/service/ProjectEstimateService.java index 8cb9054..29da356 100644 --- a/src/main/java/cn/palmte/work/service/ProjectEstimateService.java +++ b/src/main/java/cn/palmte/work/service/ProjectEstimateService.java @@ -88,7 +88,7 @@ public class ProjectEstimateService { projectEstimateCostProject.setProjectId(project.getId()); projectEstimateCostProject.setFee(ProjectEstimateCost.FEE_PROJECT_MANAGE); projectEstimateCostProject.setType(ProjectEstimateCost.TYPE_PROJECT_MANAGE); - projectEstimateCostProject.setCostTaxInclude(estimateBean.getCostProjectManageTaxInclude()); + /*projectEstimateCostProject.setCostTaxInclude(estimateBean.getCostProjectManageTaxInclude());*/ projectEstimateCostProject.setCostTaxExclude(estimateBean.getCostProjectManageTaxExclude()); projectEstimateCostRepository.saveAndFlush(projectEstimateCostProject); @@ -173,7 +173,7 @@ public class ProjectEstimateService { estimateBean.setCostPurchaseOtherTaxExclude(projectEstimateCostOther.getCostTaxExclude()); ProjectEstimateCost projectEstimateCostProjectManage = costs.stream().filter(d -> d.getType() == ProjectEstimateCost.TYPE_PROJECT_MANAGE).collect(Collectors.toList()).get(0); - estimateBean.setCostProjectManageTaxInclude(projectEstimateCostProjectManage.getCostTaxInclude()); + /*estimateBean.setCostProjectManageTaxInclude(projectEstimateCostProjectManage.getCostTaxInclude());*/ estimateBean.setCostProjectManageTaxExclude(projectEstimateCostProjectManage.getCostTaxExclude()); ProjectEstimateCost projectEstimateCostOtherOther = costs.stream().filter(d -> d.getType() == ProjectEstimateCost.TYPE_OTHER_OTHER).collect(Collectors.toList()).get(0);