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

feat 收入明细表: 

1:资金计划表修改
dev_1.0.0
chenhao 2024-10-28 14:50:07 +08:00
parent eb6ff2c297
commit 3bbf91127a
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/cn/palmte/work/model/ProjectBudgetPlanDetail.java
View File

@ -17,8 +17,8 @@ public class ProjectBudgetPlanDetail extends ProjectBudgetPlanDetailBase{
@Transient @Transient
private BigDecimal serviceCost; private BigDecimal serviceCost;
// private BigDecimal deviceCost; // private BigDecimal deviceCost;
@Transient
// private BigDecimal projectCost; private BigDecimal projectCost;
//其它支出 //其它支出
@Transient @Transient
private BigDecimal otherCost; private BigDecimal otherCost;

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

@ -677,6 +677,7 @@ public class ProjectBudgetService {
BigDecimal projectManageCost = new BigDecimal(0); BigDecimal projectManageCost = new BigDecimal(0);
BigDecimal earnestMoneyCost = new BigDecimal(0); BigDecimal earnestMoneyCost = new BigDecimal(0);
BigDecimal deviceCost = new BigDecimal(0); BigDecimal deviceCost = new BigDecimal(0);
BigDecimal projectCost = new BigDecimal(0);
BigDecimal engineerCost = new BigDecimal(0); BigDecimal engineerCost = new BigDecimal(0);
BigDecimal serviceCost = new BigDecimal(0); BigDecimal serviceCost = new BigDecimal(0);
BigDecimal otherCost = new BigDecimal(0); BigDecimal otherCost = new BigDecimal(0);
@ -695,13 +696,21 @@ public class ProjectBudgetService {
String month = budgetPlan.getMonth(); String month = budgetPlan.getMonth();
Map<String, BigDecimal> projectPayments = monthlyProjectPaymentSum.getOrDefault(month, Collections.emptyMap()); Map<String, BigDecimal> projectPayments = monthlyProjectPaymentSum.getOrDefault(month, Collections.emptyMap());
deviceCost=deviceCost.add(budgetPlan.getDeviceCost());
projectManageCost = projectManageCost.add(budgetPlan.getProjectManageCost()); projectManageCost = projectManageCost.add(budgetPlan.getProjectManageCost());
earnestMoneyCost = earnestMoneyCost.add(budgetPlan.getEarnestMoneyCost()); earnestMoneyCost = earnestMoneyCost.add(budgetPlan.getEarnestMoneyCost());
deviceCost = deviceCost.add(projectPayments.getOrDefault("设备成本", BigDecimal.ZERO)); engineerCost = engineerCost.add(budgetPlan.getEngineerCost());
engineerCost = engineerCost.add(projectPayments.getOrDefault("工程成本", BigDecimal.ZERO)); BigDecimal projectCostTemp = projectPayments.getOrDefault("工程成本", BigDecimal.ZERO);
serviceCost = serviceCost.add(projectPayments.getOrDefault("服务成本", BigDecimal.ZERO)); budgetPlan.setProjectCost(projectCostTemp);
otherCost = otherCost.add(projectPayments.getOrDefault("其他成本", BigDecimal.ZERO)); projectCost = projectCost.add(projectCostTemp);
BigDecimal serviceCostTemp = projectPayments.getOrDefault("服务成本", BigDecimal.ZERO);
budgetPlan.setServiceCost(serviceCostTemp);
serviceCost = serviceCost.add(serviceCostTemp);
BigDecimal otherCostTemp = projectPayments.getOrDefault("其他成本", BigDecimal.ZERO);
budgetPlan.setOtherCost(otherCostTemp);
otherCost = otherCost.add(otherCostTemp);
totalCost = totalCost.add(budgetPlan.getTotalCost()); totalCost = totalCost.add(budgetPlan.getTotalCost());
saleIncome = saleIncome.add(budgetPlan.getSaleIncome()); saleIncome = saleIncome.add(budgetPlan.getSaleIncome());
earnestMoneyIncome = earnestMoneyIncome.add(budgetPlan.getEarnestMoneyIncome()); earnestMoneyIncome = earnestMoneyIncome.add(budgetPlan.getEarnestMoneyIncome());
@ -721,6 +730,7 @@ public class ProjectBudgetService {
projectBudgetPlanDetail.setMonth("合计"); projectBudgetPlanDetail.setMonth("合计");
projectBudgetPlanDetail.setDeviceCost(deviceCost); projectBudgetPlanDetail.setDeviceCost(deviceCost);
projectBudgetPlanDetail.setEngineerCost(engineerCost); projectBudgetPlanDetail.setEngineerCost(engineerCost);
projectBudgetPlanDetail.setProjectCost(projectCost);
projectBudgetPlanDetail.setServiceCost(serviceCost); // 设置服务成本 projectBudgetPlanDetail.setServiceCost(serviceCost); // 设置服务成本
projectBudgetPlanDetail.setOtherCost(otherCost); // 设置其他成本 projectBudgetPlanDetail.setOtherCost(otherCost); // 设置其他成本
projectBudgetPlanDetail.setProjectManageCost(projectManageCost); projectBudgetPlanDetail.setProjectManageCost(projectManageCost);