注释与显示格式化

master
xxssyyyyssxx 2021-11-05 13:18:33 +08:00
parent 9cff2184bd
commit 1820563bb1
2 changed files with 160 additions and 78 deletions

View File

@ -7,29 +7,84 @@ import java.math.BigDecimal;
* @author xiongshiyan at 2021/11/1 , contact me with email yanshixiong@126.com or phone 15208384257 * @author xiongshiyan at 2021/11/1 , contact me with email yanshixiong@126.com or phone 15208384257
*/ */
public class IncomeCostBean { public class IncomeCostBean {
/**
*
*/
private BigDecimal incomeDeviceTaxInclude; private BigDecimal incomeDeviceTaxInclude;
/**
*
*/
private BigDecimal incomeEngineerTaxInclude; private BigDecimal incomeEngineerTaxInclude;
/**
*
*/
private BigDecimal incomeServiceTaxInclude; private BigDecimal incomeServiceTaxInclude;
/**
*
*/
private BigDecimal incomeDeviceTaxExclude; private BigDecimal incomeDeviceTaxExclude;
/**
*
*/
private BigDecimal incomeEngineerTaxExclude; private BigDecimal incomeEngineerTaxExclude;
/**
*
*/
private BigDecimal incomeServiceTaxExclude; private BigDecimal incomeServiceTaxExclude;
/**
*
*/
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;
/**
*
*/
private BigDecimal costPurchaseDeviceTaxExclude; private BigDecimal costPurchaseDeviceTaxExclude;
/**
*
*/
private BigDecimal costPurchaseBuildTaxExclude; private BigDecimal costPurchaseBuildTaxExclude;
/**
*
*/
private BigDecimal costPurchaseServiceTaxExclude; private BigDecimal costPurchaseServiceTaxExclude;
/**
*
*/
private BigDecimal costPurchaseOtherTaxExclude; private BigDecimal costPurchaseOtherTaxExclude;
/**
*
*/
private BigDecimal costProjectManageTaxExclude; private BigDecimal costProjectManageTaxExclude;
/**
*
*/
private BigDecimal costOtherOtherTaxExclude; private BigDecimal costOtherOtherTaxExclude;
/**
*
*/
private BigDecimal costExpropriationTaxExclude; private BigDecimal costExpropriationTaxExclude;
/**
*
*/
private BigDecimal costCompanyManageTaxExclude; private BigDecimal costCompanyManageTaxExclude;
public BigDecimal getIncomeDeviceTaxInclude() { public BigDecimal getIncomeDeviceTaxInclude() {
@ -56,14 +111,6 @@ public class IncomeCostBean {
this.incomeServiceTaxInclude = incomeServiceTaxInclude; this.incomeServiceTaxInclude = incomeServiceTaxInclude;
} }
public BigDecimal getIncomeTotalTaxInclude() {
if(null == incomeDeviceTaxInclude || null == incomeEngineerTaxInclude || null == incomeServiceTaxInclude){
return null;
}
return incomeDeviceTaxInclude.add(incomeEngineerTaxInclude)
.add(incomeServiceTaxInclude);
}
public BigDecimal getIncomeDeviceTaxExclude() { public BigDecimal getIncomeDeviceTaxExclude() {
return incomeDeviceTaxExclude; return incomeDeviceTaxExclude;
} }
@ -88,14 +135,6 @@ public class IncomeCostBean {
this.incomeServiceTaxExclude = incomeServiceTaxExclude; this.incomeServiceTaxExclude = incomeServiceTaxExclude;
} }
public BigDecimal getIncomeTotalTaxExclude() {
if(null == incomeDeviceTaxExclude || null == incomeEngineerTaxExclude || null ==incomeServiceTaxExclude){
return null;
}
return incomeDeviceTaxExclude.add(incomeEngineerTaxExclude)
.add(incomeServiceTaxExclude);
}
public BigDecimal getCostPurchaseDeviceTaxInclude() { public BigDecimal getCostPurchaseDeviceTaxInclude() {
return costPurchaseDeviceTaxInclude; return costPurchaseDeviceTaxInclude;
} }
@ -120,6 +159,7 @@ public class IncomeCostBean {
this.costPurchaseServiceTaxInclude = costPurchaseServiceTaxInclude; this.costPurchaseServiceTaxInclude = costPurchaseServiceTaxInclude;
} }
/*public BigDecimal getCostProjectManageTaxInclude() { /*public BigDecimal getCostProjectManageTaxInclude() {
return costProjectManageTaxInclude; return costProjectManageTaxInclude;
} }
@ -131,7 +171,6 @@ public class IncomeCostBean {
public BigDecimal getCostPurchaseOtherTaxInclude() { public BigDecimal getCostPurchaseOtherTaxInclude() {
return costPurchaseOtherTaxInclude; return costPurchaseOtherTaxInclude;
} }
public void setCostPurchaseOtherTaxInclude(BigDecimal costPurchaseOtherTaxInclude) { public void setCostPurchaseOtherTaxInclude(BigDecimal costPurchaseOtherTaxInclude) {
this.costPurchaseOtherTaxInclude = costPurchaseOtherTaxInclude; this.costPurchaseOtherTaxInclude = costPurchaseOtherTaxInclude;
} }
@ -144,23 +183,6 @@ public class IncomeCostBean {
this.costOtherOtherTaxInclude = costOtherOtherTaxInclude; this.costOtherOtherTaxInclude = costOtherOtherTaxInclude;
} }
public BigDecimal getCostTotalTaxInclude() {
if(null == costPurchaseDeviceTaxInclude
|| null == costPurchaseBuildTaxInclude
|| null == costPurchaseServiceTaxInclude
|| null == costPurchaseOtherTaxInclude
/*|| null == costProjectManageTaxInclude*/
|| null == costOtherOtherTaxInclude){
return null;
}
return costPurchaseDeviceTaxInclude
.add(costPurchaseBuildTaxInclude)
.add(costPurchaseServiceTaxInclude)
.add(costPurchaseOtherTaxInclude)
/*.add(null == costProjectManageTaxInclude ? new BigDecimal(0) : costProjectManageTaxInclude)*/
.add(costOtherOtherTaxInclude);
}
public BigDecimal getCostPurchaseDeviceTaxExclude() { public BigDecimal getCostPurchaseDeviceTaxExclude() {
return costPurchaseDeviceTaxExclude; return costPurchaseDeviceTaxExclude;
} }
@ -209,22 +231,6 @@ public class IncomeCostBean {
this.costOtherOtherTaxExclude = costOtherOtherTaxExclude; this.costOtherOtherTaxExclude = costOtherOtherTaxExclude;
} }
public BigDecimal getCostTotalTaxExclude() {
if(null == costPurchaseDeviceTaxExclude
|| null == costPurchaseBuildTaxExclude
|| null == costPurchaseServiceTaxExclude
|| null == costPurchaseOtherTaxExclude
|| null == costProjectManageTaxExclude
|| null == costOtherOtherTaxExclude){
return null;
}
return costPurchaseDeviceTaxExclude.add(costPurchaseBuildTaxExclude)
.add(costPurchaseServiceTaxExclude)
.add(costPurchaseOtherTaxExclude)
.add(costProjectManageTaxExclude)
.add(costOtherOtherTaxExclude);
}
public BigDecimal getCostExpropriationTaxExclude() { public BigDecimal getCostExpropriationTaxExclude() {
return costExpropriationTaxExclude; return costExpropriationTaxExclude;
@ -242,6 +248,72 @@ public class IncomeCostBean {
this.costCompanyManageTaxExclude = costCompanyManageTaxExclude; this.costCompanyManageTaxExclude = costCompanyManageTaxExclude;
} }
/**
*
*/
public BigDecimal getIncomeTotalTaxInclude() {
if(null == incomeDeviceTaxInclude || null == incomeEngineerTaxInclude || null == incomeServiceTaxInclude){
return null;
}
return incomeDeviceTaxInclude.add(incomeEngineerTaxInclude)
.add(incomeServiceTaxInclude);
}
/**
*
*/
public BigDecimal getIncomeTotalTaxExclude() {
if(null == incomeDeviceTaxExclude || null == incomeEngineerTaxExclude || null ==incomeServiceTaxExclude){
return null;
}
return incomeDeviceTaxExclude.add(incomeEngineerTaxExclude)
.add(incomeServiceTaxExclude);
}
/**
*
*/
public BigDecimal getCostTotalTaxInclude() {
if(null == costPurchaseDeviceTaxInclude
|| null == costPurchaseBuildTaxInclude
|| null == costPurchaseServiceTaxInclude
|| null == costPurchaseOtherTaxInclude
/*|| null == costProjectManageTaxInclude*/
|| null == costOtherOtherTaxInclude){
return null;
}
return costPurchaseDeviceTaxInclude
.add(costPurchaseBuildTaxInclude)
.add(costPurchaseServiceTaxInclude)
.add(costPurchaseOtherTaxInclude)
/*.add(null == costProjectManageTaxInclude ? new BigDecimal(0) : costProjectManageTaxInclude)*/
.add(costOtherOtherTaxInclude);
}
/**
*
*/
public BigDecimal getCostTotalTaxExclude() {
if(null == costPurchaseDeviceTaxExclude
|| null == costPurchaseBuildTaxExclude
|| null == costPurchaseServiceTaxExclude
|| null == costPurchaseOtherTaxExclude
|| null == costProjectManageTaxExclude
|| null == costOtherOtherTaxExclude){
return null;
}
return costPurchaseDeviceTaxExclude.add(costPurchaseBuildTaxExclude)
.add(costPurchaseServiceTaxExclude)
.add(costPurchaseOtherTaxExclude)
.add(costProjectManageTaxExclude)
.add(costOtherOtherTaxExclude);
}
/**
*
* --
*/
public BigDecimal getProjectGrossProfit() { public BigDecimal getProjectGrossProfit() {
BigDecimal incomeTotalTaxExclude = getIncomeTotalTaxExclude(); BigDecimal incomeTotalTaxExclude = getIncomeTotalTaxExclude();
BigDecimal costTotalTaxExclude = getCostTotalTaxExclude(); BigDecimal costTotalTaxExclude = getCostTotalTaxExclude();
@ -252,7 +324,10 @@ public class IncomeCostBean {
return incomeTotalTaxExclude.subtract(costTotalTaxExclude).subtract(costExpropriationTaxExclude); return incomeTotalTaxExclude.subtract(costTotalTaxExclude).subtract(costExpropriationTaxExclude);
} }
/**
*
* /
*/
public BigDecimal getProjectGrossProfitRate() { public BigDecimal getProjectGrossProfitRate() {
BigDecimal projectGrossProfit = getProjectGrossProfit(); BigDecimal projectGrossProfit = getProjectGrossProfit();
BigDecimal incomeTotalTaxExclude = getIncomeTotalTaxExclude(); BigDecimal incomeTotalTaxExclude = getIncomeTotalTaxExclude();
@ -262,6 +337,10 @@ public class IncomeCostBean {
return projectGrossProfit.multiply(new BigDecimal(100)).divide(incomeTotalTaxExclude,2,BigDecimal.ROUND_HALF_UP); return projectGrossProfit.multiply(new BigDecimal(100)).divide(incomeTotalTaxExclude,2,BigDecimal.ROUND_HALF_UP);
} }
/**
*
* -
*/
public BigDecimal getProjectContributionProfit() { public BigDecimal getProjectContributionProfit() {
BigDecimal projectGrossProfit = getProjectGrossProfit(); BigDecimal projectGrossProfit = getProjectGrossProfit();
BigDecimal costCompanyManageTaxExclude = getCostCompanyManageTaxExclude(); BigDecimal costCompanyManageTaxExclude = getCostCompanyManageTaxExclude();
@ -270,7 +349,10 @@ public class IncomeCostBean {
} }
return projectGrossProfit.subtract(costCompanyManageTaxExclude); return projectGrossProfit.subtract(costCompanyManageTaxExclude);
} }
/**
*
* /
*/
public BigDecimal getProjectContributionProfitRate() { public BigDecimal getProjectContributionProfitRate() {
BigDecimal projectContributionProfit = getProjectContributionProfit(); BigDecimal projectContributionProfit = getProjectContributionProfit();
BigDecimal incomeTotalTaxExclude = getIncomeTotalTaxExclude(); BigDecimal incomeTotalTaxExclude = getIncomeTotalTaxExclude();

View File

@ -608,18 +608,18 @@
</tr> </tr>
<tr> <tr>
<td><input type="text" class="am-modal-prompt-input input-total-month-budget-plan" value="${projectBudgetPlanDetailTotal.month}" readonly/></td> <td><input type="text" class="am-modal-prompt-input input-total-month-budget-plan" value="${projectBudgetPlanDetailTotal.month}" readonly/></td>
<td><input type="text" class="am-modal-prompt-input input-total-device-cost-budget-plan" value="${projectBudgetPlanDetailTotal.deviceCost}" readonly/></td> <td><input type="text" class="am-modal-prompt-input input-total-device-cost-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotal.deviceCost)}" readonly/></td>
<td><input type="text" class="am-modal-prompt-input input-total-engineer-cost-budget-plan" value="${projectBudgetPlanDetailTotal.engineerCost}" readonly/></td> <td><input type="text" class="am-modal-prompt-input input-total-engineer-cost-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotal.engineerCost)}" readonly/></td>
<td><input type="text" class="am-modal-prompt-input input-total-project-manage-cost-budget-plan" value="${projectBudgetPlanDetailTotal.projectManageCost}" readonly/></td> <td><input type="text" class="am-modal-prompt-input input-total-project-manage-cost-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotal.projectManageCost)}" readonly/></td>
<td><input type="text" class="am-modal-prompt-input input-total-earnest-money-cost-budget-plan" value="${projectBudgetPlanDetailTotal.earnestMoneyCost}" readonly/></td> <td><input type="text" class="am-modal-prompt-input input-total-earnest-money-cost-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotal.earnestMoneyCost)}" readonly/></td>
<td><input type="text" class="am-modal-prompt-input input-total-total-cost-budget-plan" value="${projectBudgetPlanDetailTotal.totalCost}" readonly/></td> <td><input type="text" class="am-modal-prompt-input input-total-total-cost-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotal.totalCost)}" readonly/></td>
<td><input type="text" class="am-modal-prompt-input input-total-sale-income-budget-plan" value="${projectBudgetPlanDetailTotal.saleIncome}" readonly/></td> <td><input type="text" class="am-modal-prompt-input input-total-sale-income-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotal.saleIncome)}" readonly/></td>
<td><input type="text" class="am-modal-prompt-input input-total-earnest-money-income-budget-plan" value="${projectBudgetPlanDetailTotal.earnestMoneyIncome}" readonly/></td> <td><input type="text" class="am-modal-prompt-input input-total-earnest-money-income-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotal.earnestMoneyIncome)}" readonly/></td>
<td><input type="text" class="am-modal-prompt-input input-total-total-income-budget-plan" value="${projectBudgetPlanDetailTotal.totalIncome}" readonly/></td> <td><input type="text" class="am-modal-prompt-input input-total-total-income-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotal.totalIncome)}" readonly/></td>
<td><input type="text" class="am-modal-prompt-input input-total-fund-balance-budget-plan" value="${projectBudgetPlanDetailTotal.fundBalance}" readonly/></td> <td><input type="text" class="am-modal-prompt-input input-total-fund-balance-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotal.fundBalance)}" readonly/></td>
<td><input type="text" class="am-modal-prompt-input input-total-capital-interest-budget-plan" value="${projectBudgetPlanDetailTotal.capitalInterest}" readonly/></td> <td><input type="text" class="am-modal-prompt-input input-total-capital-interest-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotal.capitalInterest)}" readonly/></td>
<td><input type="text" class="am-modal-prompt-input input-total-underwritten-plan-budget-plan" value="${projectBudgetPlanDetailTotal.underwrittenPlan}" readonly/></td> <td><input type="text" class="am-modal-prompt-input input-total-underwritten-plan-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotal.underwrittenPlan)}" readonly/></td>
<td><input type="text" class="am-modal-prompt-input input-total-repayment-plan-budget-plan" value="${projectBudgetPlanDetailTotal.repaymentPlan}" readonly/></td> <td><input type="text" class="am-modal-prompt-input input-total-repayment-plan-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotal.repaymentPlan)}" readonly/></td>
<td></td> <td></td>
</tr> </tr>
@ -627,18 +627,18 @@
<#list projectBudgetPlanDetails as projectBudgetPlanDetail> <#list projectBudgetPlanDetails as projectBudgetPlanDetail>
<tr> <tr>
<td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-month-budget-plan" value="${projectBudgetPlanDetail.month!}"></td> <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-month-budget-plan" value="${projectBudgetPlanDetail.month!}"></td>
<td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-device-cost-budget-plan" value="${projectBudgetPlanDetail.deviceCost!}"></td> <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-device-cost-budget-plan" value="${Utils.format(projectBudgetPlanDetail.deviceCost)}"></td>
<td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-engineer-cost-budget-plan" value="${projectBudgetPlanDetail.engineerCost!}"></td> <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-engineer-cost-budget-plan" value="${Utils.format(projectBudgetPlanDetail.engineerCost)}"></td>
<td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-project-manage-cost-budget-plan" value="${projectBudgetPlanDetail.projectManageCost!}"></td> <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-project-manage-cost-budget-plan" value="${Utils.format(projectBudgetPlanDetail.projectManageCost)}"></td>
<td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-earnest-money-cost-budget-plan" value="${projectBudgetPlanDetail.earnestMoneyCost!}"></td> <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-earnest-money-cost-budget-plan" value="${Utils.format(projectBudgetPlanDetail.earnestMoneyCost)}"></td>
<td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-total-cost-budget-plan" value="${projectBudgetPlanDetail.totalCost!}" readonly></td> <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-total-cost-budget-plan" value="${Utils.format(projectBudgetPlanDetail.totalCost)}" readonly></td>
<td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-sale-income-budget-plan" value="${projectBudgetPlanDetail.saleIncome!}"></td> <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-sale-income-budget-plan" value="${Utils.format(projectBudgetPlanDetail.saleIncome)}"></td>
<td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-earnest-money-income-budget-plan" value="${projectBudgetPlanDetail.earnestMoneyIncome!}"></td> <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-earnest-money-income-budget-plan" value="${Utils.format(projectBudgetPlanDetail.earnestMoneyIncome)}"></td>
<td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-total-income-budget-plan" value="${projectBudgetPlanDetail.totalIncome!}" readonly></td> <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-total-income-budget-plan" value="${Utils.format(projectBudgetPlanDetail.totalIncome)}" readonly></td>
<td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-fund-balance-budget-plan" value="${projectBudgetPlanDetail.fundBalance!}" readonly></td> <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-fund-balance-budget-plan" value="${Utils.format(projectBudgetPlanDetail.fundBalance)}" readonly></td>
<td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-capital-interest-budget-plan" value="${projectBudgetPlanDetail.capitalInterest!}" readonly></td> <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-capital-interest-budget-plan" value="${Utils.format(projectBudgetPlanDetail.capitalInterest)}" readonly></td>
<td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-underwritten-plan-budget-plan" value="${projectBudgetPlanDetail.underwrittenPlan!}" readonly></td> <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-underwritten-plan-budget-plan" value="${Utils.format(projectBudgetPlanDetail.underwrittenPlan)}" readonly></td>
<td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-repayment-plan-budget-plan" value="${projectBudgetPlanDetail.repaymentPlan!}" readonly></td> <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-repayment-plan-budget-plan" value="${Utils.format(projectBudgetPlanDetail.repaymentPlan)}" readonly></td>
<td><button type="button" class="am-btn am-btn-warning am-btn-xs am-round am-modal-line-delete-budget-plan"><span class="am-icon-minus"></span></button></td> <td><button type="button" class="am-btn am-btn-warning am-btn-xs am-round am-modal-line-delete-budget-plan"><span class="am-icon-minus"></span></button></td>
</tr> </tr>
</#list> </#list>