From 900a133bc7f4374bf676c403fa11fc639b47810a Mon Sep 17 00:00:00 2001
From: OathK1per <zhangypg@gmail.com>
Date: Mon, 10 Jan 2022 18:04:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A9=E6=B6=A6=E7=8E=87=E5=85=81=E8=AE=B8?=
 =?UTF-8?q?=E8=AE=A1=E7=AE=97=E8=B4=9F=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/templates/admin/project_settle_edit.ftl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/templates/admin/project_settle_edit.ftl b/src/main/resources/templates/admin/project_settle_edit.ftl
index f78d525..3e89520 100644
--- a/src/main/resources/templates/admin/project_settle_edit.ftl
+++ b/src/main/resources/templates/admin/project_settle_edit.ftl
@@ -251,7 +251,7 @@
                         <td><input name="grossProfitFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.grossProfit,'0')}" required readonly title="项目毛利上月结算总额"></td>
                         <td><input type="text" class="number" maxlength="16" name="grossProfit" value="${Utils.format(monthBean.grossProfit,'0')}" readonly required title="项目毛利本月结算金额"></td>
                         <td><input type="text" class="number" name="grossProfitSettleTotal" value="${Utils.format(currentBean.grossProfit,'0')}" readonly title="项目毛利结算总额"></td>
-                        <td><input name="grossProfitProfitMargin" type="text" class="number" <#if currentBean.getIncomeTotalTaxExclude() lt 0.01>value="${Utils.format(100 * currentBean.grossProfit,'0')}"<#else>value="${Utils.format(100 * currentBean.grossProfit / currentBean.getIncomeTotalTaxExclude(),'0')}"</#if> readonly title="项目毛利利润率"></td>
+                        <td><input name="grossProfitProfitMargin" type="text" class="number" <#if currentBean.getIncomeTotalTaxExclude() lt 0.01 && currentBean.getIncomeTotalTaxExclude() gt -0.01>value="${Utils.format(100 * currentBean.grossProfit,'0')}"<#else>value="${Utils.format(100 * currentBean.grossProfit / currentBean.getIncomeTotalTaxExclude(),'0')}"</#if> readonly title="项目毛利利润率"></td>
                     </tr>
                     <tr>
                         <td>项目贡献利润</td>
@@ -260,7 +260,7 @@
                         <td><input name="contributionProfitFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.contributionProfit,'0')}" required readonly title="项目贡献利润上月结算总额"></td>
                         <td><input type="text" class="number" maxlength="16" name="contributionProfit" value="${Utils.format(monthBean.contributionProfit,'0')}" readonly required title="项目贡献利润本月结算金额"></td>
                         <td><input type="text" class="number" name="contributionProfitSettleTotal" value="${Utils.format(currentBean.contributionProfit,'0')}" readonly title="项目贡献利润结算总额"></td>
-                        <td><input name="contributionProfitProfitMargin" type="text" class="number" <#if currentBean.getIncomeTotalTaxExclude() lt 0.01>value="${Utils.format(100 * currentBean.grossProfit,'0')}"<#else>value="${Utils.format(100 * currentBean.grossProfit / currentBean.getIncomeTotalTaxExclude(),'0')}"</#if> readonly title="项目贡献利润利润率"></td>
+                        <td><input name="contributionProfitProfitMargin" type="text" class="number" <#if currentBean.getIncomeTotalTaxExclude() lt 0.01 && currentBean.getIncomeTotalTaxExclude() gt -0.01>value="${Utils.format(100 * currentBean.grossProfit,'0')}"<#else>value="${Utils.format(100 * currentBean.grossProfit / currentBean.getIncomeTotalTaxExclude(),'0')}"</#if> readonly title="项目贡献利润利润率"></td>
                     </tr>
                     <tr>
                         <td>项目净利润</td>
@@ -269,7 +269,7 @@
                         <td><input name="netProfitFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.netProfit,'0')}" required readonly title="项目净利润上月结算总额"></td>
                         <td><input type="text" class="number" maxlength="16" name="netProfit" value="${Utils.format(monthBean.netProfit,'0')}" readonly required title="项目净利润本月结算金额"></td>
                         <td><input type="text" class="number" name="netProfitSettleTotal" value="${Utils.format(currentBean.netProfit,'0')}" readonly title="项目净利润结算总额"></td>
-                        <td><input name="netProfitProfitMargin" type="text" class="number" <#if currentBean.getIncomeTotalTaxExclude() lt 0.01>value="${Utils.format(100 * currentBean.grossProfit,'0')}"<#else>value="${Utils.format(100 * currentBean.grossProfit / currentBean.getIncomeTotalTaxExclude(),'0')}"</#if> readonly title="项目净利润利润率"></td>
+                        <td><input name="netProfitProfitMargin" type="text" class="number" <#if currentBean.getIncomeTotalTaxExclude() lt 0.01 && currentBean.getIncomeTotalTaxExclude() gt -0.01>value="${Utils.format(100 * currentBean.grossProfit,'0')}"<#else>value="${Utils.format(100 * currentBean.grossProfit / currentBean.getIncomeTotalTaxExclude(),'0')}"</#if> readonly title="项目净利润利润率"></td>
                     </tr>
                     </tbody>
                 </table>