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

去掉对其他的校验

master
OathK1per 2022-01-13 16:35:29 +08:00
parent a2c5bac002
commit 8ca296b7c0
9 changed files with 32 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/cn/palmte/work/bean/BudgetSettleBean.java
View File

@ -232,7 +232,7 @@ public class BudgetSettleBean {
}
public BigDecimal getCostOtherBudgetTotal() {
return costOtherBudgetTotal;
return (costOtherBudgetTotal == null)?BigDecimal.ZERO:costOtherBudgetTotal;
}
public void setCostOtherBudgetTotal(BigDecimal costOtherBudgetTotal) {

2
src/main/java/cn/palmte/work/bean/EstimateSettleBean.java
View File

@ -169,7 +169,7 @@ public class EstimateSettleBean {
}
public BigDecimal getCostOtherEstimateTotal() {
return costOtherEstimateTotal;
return (costOtherEstimateTotal == null)?BigDecimal.ZERO:costOtherEstimateTotal;
}
public void setCostOtherEstimateTotal(BigDecimal costOtherEstimateTotal) {

4
src/main/java/cn/palmte/work/bean/FinalBean.java
View File

@ -83,7 +83,7 @@ public class FinalBean {
BigDecimal costOtherFinalTotal = getCostOtherFinalTotal();
if (null == costPurchaseDeviceFinalTotal || null == costPurchaseBuildFinalTotal || null == costPurchaseServiceFinalTotal
|| null == costPurchaseOtherFinalTotal || null == costProjectManageFinalTotal || null == costOtherFinalTotal) {
|| null == costPurchaseOtherFinalTotal || null == costProjectManageFinalTotal) {
return new BigDecimal(0);
}
@ -472,7 +472,7 @@ public class FinalBean {
}
public BigDecimal getCostOtherFinalTotal() {
return costOtherFinalTotal;
return (costOtherFinalTotal == null)?BigDecimal.ZERO:costOtherFinalTotal;
}
public void setCostOtherFinalTotal(BigDecimal costOtherFinalTotal) {

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

@ -285,6 +285,9 @@ public abstract class IncomeCostBean {
}
public BigDecimal getCostOtherOtherTaxInclude() {
if (costOtherOtherTaxInclude == null) {
return BigDecimal.ZERO;
}
return handleSpecial(costOtherOtherTaxInclude);
}
@ -333,6 +336,9 @@ public abstract class IncomeCostBean {
}
public BigDecimal getCostOtherOtherTaxExclude() {
if (costOtherOtherTaxExclude == null) {
return BigDecimal.ZERO;
}
return handleSpecial(costOtherOtherTaxExclude);
}

3
src/main/java/cn/palmte/work/bean/SettleBean.java
View File

@ -339,6 +339,9 @@ public class SettleBean {
}
public BigDecimal getCostOther() {
if (costOther == null) {
return BigDecimal.ZERO;
}
return handleSpecial(costOther);
}

3
src/main/java/cn/palmte/work/bean/SettleMonthBean.java
View File

@ -484,6 +484,9 @@ public class SettleMonthBean {
}
public BigDecimal getCostOther() {
if (costOther == null) {
return BigDecimal.ZERO;
}
return handleSpecial(costOther);
}

26
src/main/resources/templates/admin/project_approve.ftl
View File

@ -355,8 +355,8 @@
<td>成本</td>
<td>其他</td>
<td>${project.otherName!}</td>
<td><input type="text" class="number" name="costOtherOtherTaxInclude" value="${Utils.format(estimateBean.costOtherOtherTaxInclude)}" required readonly></td>
<td><input type="text" class="number" name="costOtherOtherTaxExclude" value="${Utils.format(estimateBean.costOtherOtherTaxExclude)}" required readonly></td>
<td><input type="text" class="number" name="costOtherOtherTaxInclude" value="${Utils.format(estimateBean.costOtherOtherTaxInclude, "0.00")}" required readonly></td>
<td><input type="text" class="number" name="costOtherOtherTaxExclude" value="${Utils.format(estimateBean.costOtherOtherTaxExclude, "0.00")}" required readonly></td>
</tr>
<tr>
<td>合计</td>
@ -901,8 +901,8 @@
<td>成本</td>
<td>其他</td>
<td>${project.otherName!}</td>
<td><input type="text" class="number" name="costOtherOtherTaxInclude" value="${Utils.format(budgetBean.costOtherOtherTaxInclude,'0')}" required readonly title="其他含税总额（填入）"></td>
<td><input type="text" class="number" name="costOtherOtherTaxExclude" value="${Utils.format(budgetBean.costOtherOtherTaxExclude,'0')}" required readonly title="其他不含税总额（填入）"></td>
<td><input type="text" class="number" name="costOtherOtherTaxInclude" value="${Utils.format(budgetBean.costOtherOtherTaxInclude,'0.00')}" required readonly title="其他含税总额（填入）"></td>
<td><input type="text" class="number" name="costOtherOtherTaxExclude" value="${Utils.format(budgetBean.costOtherOtherTaxExclude,'0.00')}" required readonly title="其他不含税总额（填入）"></td>
</tr>
<tr>
<td>合计</td>
@ -1169,11 +1169,11 @@
<td>成本</td>
<td>其他</td>
<td>${project.otherName!}</td>
<td><input name="costOtherEstimateTotal" type="text" class="number" value="${Utils.format(monthBean.estimateCostOther,'0')}" readonly required title="其他成本概算总额"></td>
<td><input name="costOtherBudgetTotal" type="text" class="number" value="${Utils.format(monthBean.budgetCostOther,'0')}" readonly required title="其他成本预算总额"></td>
<td><input name="costOtherFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.costOtherOtherTaxExclude,'0')}" required readonly title="其他成本上月结算总额"></td>
<td><input type="text" class="number" name="costOther" value="${Utils.format(monthBean.costOther,'0')}" required readonly title="其他成本本月结算金额"></td>
<td><input type="text" class="number" name="costOtherSettleTotal" value="${Utils.format(currentBean.costOtherOtherTaxExclude,'0')}" readonly title="其他成本结算总额"></td>
<td><input name="costOtherEstimateTotal" type="text" class="number" value="${Utils.format(monthBean.estimateCostOther,'0.00')}" readonly required title="其他成本概算总额"></td>
<td><input name="costOtherBudgetTotal" type="text" class="number" value="${Utils.format(monthBean.budgetCostOther,'0.00')}" readonly required title="其他成本预算总额"></td>
<td><input name="costOtherFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.costOtherOtherTaxExclude,'0.00')}" required readonly title="其他成本上月结算总额"></td>
<td><input type="text" class="number" name="costOther" value="${Utils.format(monthBean.costOther,'0.00')}" required readonly title="其他成本本月结算金额"></td>
<td><input type="text" class="number" name="costOtherSettleTotal" value="${Utils.format(currentBean.costOtherOtherTaxExclude,'0.00')}" readonly title="其他成本结算总额"></td>
</tr>
<tr>
<td>合计</td>
@ -1521,10 +1521,10 @@
<td>成本</td>
<td>其他</td>
<td>${project.otherName!}</td>
<td><input name="costOtherOtherTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.costOtherOtherTaxExclude,'0')}" readonly required title="其他成本概算总额"></td>
<td><input name="costOtherOtherTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.costOtherOtherTaxExclude,'0')}" readonly required title="其他成本预算总额"></td>
<td><input name="costOtherSettleTotal" value="${Utils.format(currentBean.costOtherOtherTaxExclude,'0')}" type="text" class="number" type="text" class="number"readonly required title="其他成本结算总额"></td>
<td><input name="costOtherFinalTotal" type="text" class="number" value="${Utils.format(finalBean.costOtherFinalTotal,'0')}" required readonly title="其他成本决算总额"></td>
<td><input name="costOtherOtherTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.costOtherOtherTaxExclude,'0.00')}" readonly required title="其他成本概算总额"></td>
<td><input name="costOtherOtherTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.costOtherOtherTaxExclude,'0.00')}" readonly required title="其他成本预算总额"></td>
<td><input name="costOtherSettleTotal" value="${Utils.format(currentBean.costOtherOtherTaxExclude,'0.00')}" type="text" class="number" readonly required title="其他成本结算总额"></td>
<td><input name="costOtherFinalTotal" type="text" class="number" value="${Utils.format(finalBean.costOtherFinalTotal,'0.00')}" required readonly title="其他成本决算总额"></td>
</tr>
<tr>
<td>合计</td>

4
src/main/resources/templates/admin/project_estimate_edit.ftl
View File

@ -365,8 +365,8 @@
<td>其他</td>
<td><input type="text" id="otherName" maxlength="10" data-validate-async data-validation-message="请输入其他类的名称（10字符以内）"
value="${project.otherName!}" name="otherName" placeholder="请输入其他类的名称（10字符以内）"/> </td>
<td><input type="text" class="number" maxlength="16" name="costOtherOtherTaxInclude" value="${Utils.format(estimateBean.costOtherOtherTaxInclude)}"></td>
<td><input type="text" class="number" maxlength="16" name="costOtherOtherTaxExclude" value="${Utils.format(estimateBean.costOtherOtherTaxExclude)}" <#if estimateBean.costOtherOtherSelect! !="自定义">readonly</#if>></td>
<td><input type="text" class="number" maxlength="16" name="costOtherOtherTaxInclude" value="${Utils.format(estimateBean.costOtherOtherTaxInclude, "0.00")}"></td>
<td><input type="text" class="number" maxlength="16" name="costOtherOtherTaxExclude" value="${Utils.format(estimateBean.costOtherOtherTaxExclude, "0.00")}" <#if estimateBean.costOtherOtherSelect! !="自定义">readonly</#if>></td>
<td>
<select data-am-selected name="costOtherOtherSelect" id="costOtherOtherSelect">
<option value="请选择税率">请选择税率</option>

2
src/main/resources/templates/admin/project_settle_edit.ftl
View File

@ -167,7 +167,7 @@
<td><input name="costOtherBudgetTotal" type="text" class="number" value="${Utils.format(budgetBean.costOtherOtherTaxExclude,'0.00')}" readonly title="其他成本预算总额"></td>
<td><input name="costOtherFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.costOtherOtherTaxExclude,'0.00')}" readonly title="其他成本上月结算总额"></td>
<td><input type="text" class="number" maxlength="16" name="costOther" value="${Utils.format(monthBean.costOther,'0.00')}" title="其他成本本月结算金额"></td>
<td><input type="text" class="number" name="costOtherSettleTotal" value="${Utils.format(currentBean.costOtherOtherTaxExclude,'0')}" readonly title="其他成本结算总额"></td>
<td><input type="text" class="number" name="costOtherSettleTotal" value="${Utils.format(currentBean.costOtherOtherTaxExclude,'0.00')}" readonly title="其他成本结算总额"></td>
</tr>
<tr>
<td>合计</td>