mula
/
fourcal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

概算也没有项目管理成本含税金额

master
xxssyyyyssxx 2021-11-03 17:26:06 +08:00
parent 88f3b379fa
commit 683754d315
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/cn/palmte/work/bean/IncomeCostBean.java
View File

@ -18,7 +18,7 @@ public class IncomeCostBean {
private BigDecimal costPurchaseDeviceTaxInclude; private BigDecimal costPurchaseDeviceTaxInclude;
private BigDecimal costPurchaseBuildTaxInclude; private BigDecimal costPurchaseBuildTaxInclude;
private BigDecimal costPurchaseServiceTaxInclude; private BigDecimal costPurchaseServiceTaxInclude;
private BigDecimal costProjectManageTaxInclude; /*private BigDecimal costProjectManageTaxInclude;*/
private BigDecimal costPurchaseOtherTaxInclude; private BigDecimal costPurchaseOtherTaxInclude;
private BigDecimal costOtherOtherTaxInclude; private BigDecimal costOtherOtherTaxInclude;
@ -120,13 +120,13 @@ public class IncomeCostBean {
this.costPurchaseServiceTaxInclude = costPurchaseServiceTaxInclude; this.costPurchaseServiceTaxInclude = costPurchaseServiceTaxInclude;
} }
public BigDecimal getCostProjectManageTaxInclude() { /*public BigDecimal getCostProjectManageTaxInclude() {
return costProjectManageTaxInclude; return costProjectManageTaxInclude;
} }
public void setCostProjectManageTaxInclude(BigDecimal costProjectManageTaxInclude) { public void setCostProjectManageTaxInclude(BigDecimal costProjectManageTaxInclude) {
this.costProjectManageTaxInclude = costProjectManageTaxInclude; this.costProjectManageTaxInclude = costProjectManageTaxInclude;
} }*/
public BigDecimal getCostPurchaseOtherTaxInclude() { public BigDecimal getCostPurchaseOtherTaxInclude() {
return costPurchaseOtherTaxInclude; return costPurchaseOtherTaxInclude;

4
src/main/java/cn/palmte/work/service/ProjectBudgetService.java
View File

@ -94,7 +94,7 @@ public class ProjectBudgetService {
projectBudgetCostProject.setProjectId(project.getId()); projectBudgetCostProject.setProjectId(project.getId());
projectBudgetCostProject.setFee(ProjectBudgetCost.FEE_PROJECT_MANAGE); projectBudgetCostProject.setFee(ProjectBudgetCost.FEE_PROJECT_MANAGE);
projectBudgetCostProject.setType(ProjectBudgetCost.TYPE_PROJECT_MANAGE); projectBudgetCostProject.setType(ProjectBudgetCost.TYPE_PROJECT_MANAGE);
projectBudgetCostProject.setCostTaxInclude(budgetBean.getCostProjectManageTaxInclude()); /*projectBudgetCostProject.setCostTaxInclude(budgetBean.getCostProjectManageTaxInclude());*/
projectBudgetCostProject.setCostTaxExclude(budgetBean.getCostProjectManageTaxExclude()); projectBudgetCostProject.setCostTaxExclude(budgetBean.getCostProjectManageTaxExclude());
projectBudgetCostRepository.saveAndFlush(projectBudgetCostProject); projectBudgetCostRepository.saveAndFlush(projectBudgetCostProject);
@ -185,7 +185,7 @@ public class ProjectBudgetService {
budgetBean.setCostPurchaseOtherTaxExclude(projectBudgetCostOther.getCostTaxExclude()); budgetBean.setCostPurchaseOtherTaxExclude(projectBudgetCostOther.getCostTaxExclude());
ProjectBudgetCost projectBudgetCostProjectManage = costs.stream().filter(d -> d.getType() == ProjectBudgetCost.TYPE_PROJECT_MANAGE).collect(Collectors.toList()).get(0); 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()); budgetBean.setCostProjectManageTaxExclude(projectBudgetCostProjectManage.getCostTaxExclude());
ProjectBudgetCost projectBudgetCostOtherOther = costs.stream().filter(d -> d.getType() == ProjectBudgetCost.TYPE_OTHER_OTHER).collect(Collectors.toList()).get(0); ProjectBudgetCost projectBudgetCostOtherOther = costs.stream().filter(d -> d.getType() == ProjectBudgetCost.TYPE_OTHER_OTHER).collect(Collectors.toList()).get(0);

4
src/main/java/cn/palmte/work/service/ProjectEstimateService.java
View File

@ -88,7 +88,7 @@ public class ProjectEstimateService {
projectEstimateCostProject.setProjectId(project.getId()); projectEstimateCostProject.setProjectId(project.getId());
projectEstimateCostProject.setFee(ProjectEstimateCost.FEE_PROJECT_MANAGE); projectEstimateCostProject.setFee(ProjectEstimateCost.FEE_PROJECT_MANAGE);
projectEstimateCostProject.setType(ProjectEstimateCost.TYPE_PROJECT_MANAGE); projectEstimateCostProject.setType(ProjectEstimateCost.TYPE_PROJECT_MANAGE);
projectEstimateCostProject.setCostTaxInclude(estimateBean.getCostProjectManageTaxInclude()); /*projectEstimateCostProject.setCostTaxInclude(estimateBean.getCostProjectManageTaxInclude());*/
projectEstimateCostProject.setCostTaxExclude(estimateBean.getCostProjectManageTaxExclude()); projectEstimateCostProject.setCostTaxExclude(estimateBean.getCostProjectManageTaxExclude());
projectEstimateCostRepository.saveAndFlush(projectEstimateCostProject); projectEstimateCostRepository.saveAndFlush(projectEstimateCostProject);
@ -173,7 +173,7 @@ public class ProjectEstimateService {
estimateBean.setCostPurchaseOtherTaxExclude(projectEstimateCostOther.getCostTaxExclude()); estimateBean.setCostPurchaseOtherTaxExclude(projectEstimateCostOther.getCostTaxExclude());
ProjectEstimateCost projectEstimateCostProjectManage = costs.stream().filter(d -> d.getType() == ProjectEstimateCost.TYPE_PROJECT_MANAGE).collect(Collectors.toList()).get(0); 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()); estimateBean.setCostProjectManageTaxExclude(projectEstimateCostProjectManage.getCostTaxExclude());
ProjectEstimateCost projectEstimateCostOtherOther = costs.stream().filter(d -> d.getType() == ProjectEstimateCost.TYPE_OTHER_OTHER).collect(Collectors.toList()).get(0); ProjectEstimateCost projectEstimateCostOtherOther = costs.stream().filter(d -> d.getType() == ProjectEstimateCost.TYPE_OTHER_OTHER).collect(Collectors.toList()).get(0);