From 5d2976e9f3855e0fbec97e76b38e949c03ede5ca Mon Sep 17 00:00:00 2001
From: OathK1per <zhangypg@gmail.com>
Date: Mon, 29 Nov 2021 13:19:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=BA=E5=8A=9B=E6=88=90?=
 =?UTF-8?q?=E6=9C=AC=E6=A8=A1=E6=9D=BF=E5=92=8C=E7=BB=93=E7=AE=97=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/palmte/work/service/HumanCostService.java     | 3 ++-
 src/main/resources/templates/admin/project_settle_add.ftl | 6 +++---
 .../resources/templates/admin/project_settle_edit.ftl     | 8 ++++----
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/main/java/cn/palmte/work/service/HumanCostService.java b/src/main/java/cn/palmte/work/service/HumanCostService.java
index c80fadc..aea198e 100644
--- a/src/main/java/cn/palmte/work/service/HumanCostService.java
+++ b/src/main/java/cn/palmte/work/service/HumanCostService.java
@@ -232,7 +232,8 @@ public class HumanCostService {
     }
 
     public String[] template(List<String> data) {
-        List<Admin> admins = adminRepository.getAllEnable();
+        String adminSql = "select su.* from sys_user su left join sys_user_role sur on su.id = sur.user_id where su.is_deleted = 0 and su.enabled = 1 and sur.role_id <> 1 group by su.id";
+        List<Admin> admins = pagination.find(adminSql, Admin.class);
         String[] headers = new String[admins.size() + 1];
         headers[0] = "项目名称";
         for (int i = 1; i <= admins.size(); i++) {
diff --git a/src/main/resources/templates/admin/project_settle_add.ftl b/src/main/resources/templates/admin/project_settle_add.ftl
index 59a03e9..c6ea327 100644
--- a/src/main/resources/templates/admin/project_settle_add.ftl
+++ b/src/main/resources/templates/admin/project_settle_add.ftl
@@ -154,10 +154,10 @@
                         <td>项目管理成本</td>
                         <td><input name="costProjectManageEstimateTotal" type="number" value="${Utils.format(estimateBean.costProjectManageTaxExclude,'0')}" readonly required title="项目管理成本概算总额"></td>
                         <td><input name="costProjectManageBudgetTotal" type="number" value="${Utils.format(budgetBean.costProjectManageTaxExclude,'0')}" readonly required title="项目管理成本预算总额"></td>
-                        <td><input name="costProjectManageFormerSettleTotal" type="number" value="${Utils.format(formerBean.costProjectManageTaxExclude,'0')}" required readonly title="项目管理成本上月结算总额">
+                        <td><input name="costProjectManageFormerSettleTotal" type="number" value="${Utils.format(formerBean.costProjectManageTaxExclude,'0')}" required readonly title="项目管理成本上月结算总额"></td>
+                        <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costProjectManage" required title="项目管理成本本月结算金额">
                             <span>人力成本：${Utils.format(salary,'0')} 元</span>
                         </td>
-                        <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costProjectManage" required title="项目管理成本本月结算金额"></td>
                         <td><input type="number" name="costProjectManageSettleTotal" readonly title="项目管理成本结算总额"></td>
                     </tr>
                     <tr>
@@ -275,7 +275,7 @@
                     </tbody>
                 </table>
 
-                <span class="am-text-lg">现金流量表</span>
+                <span class="am-text-lg">结算现金流量表</span>
                 <table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;">
                     <tbody>
                     <tr class="am-text-xl">
diff --git a/src/main/resources/templates/admin/project_settle_edit.ftl b/src/main/resources/templates/admin/project_settle_edit.ftl
index 4587642..78eb694 100644
--- a/src/main/resources/templates/admin/project_settle_edit.ftl
+++ b/src/main/resources/templates/admin/project_settle_edit.ftl
@@ -250,7 +250,7 @@
                         <td><input name="grossProfitFormerSettleTotal" type="number" value="${Utils.format(formerBean.grossProfit,'0')}" required readonly title="项目毛利上月结算总额"></td>
                         <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="grossProfit" value="${Utils.format(monthBean.grossProfit,'0')}" readonly required title="项目毛利本月结算金额"></td>
                         <td><input type="number" name="grossProfitSettleTotal" value="${Utils.format(currentBean.grossProfit,'0')}" readonly title="项目毛利结算总额"></td>
-                        <td><input name="grossProfitProfitMargin" type="number" value="${Utils.format(100 * currentBean.grossProfit / currentBean.getIncomeTotalTaxExclude(),'0')}" readonly title="项目毛利利润率"></td>
+                        <td><input name="grossProfitProfitMargin" type="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>
                     </tr>
                     <tr>
                         <td>项目贡献利润</td>
@@ -259,7 +259,7 @@
                         <td><input name="contributionProfitFormerSettleTotal" type="number" value="${Utils.format(formerBean.contributionProfit,'0')}" required readonly title="项目贡献利润上月结算总额"></td>
                         <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="contributionProfit" value="${Utils.format(monthBean.contributionProfit,'0')}" readonly required title="项目贡献利润本月结算金额"></td>
                         <td><input type="number" name="contributionProfitSettleTotal" value="${Utils.format(currentBean.contributionProfit,'0')}" readonly title="项目贡献利润结算总额"></td>
-                        <td><input name="contributionProfitProfitMargin" type="number" value="${Utils.format(100 * currentBean.contributionProfit / currentBean.getIncomeTotalTaxExclude(),'0')}" readonly title="项目贡献利润利润率"></td>
+                        <td><input name="contributionProfitProfitMargin" type="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>
                     </tr>
                     <tr>
                         <td>项目净利润</td>
@@ -268,12 +268,12 @@
                         <td><input name="netProfitFormerSettleTotal" type="number" value="${Utils.format(formerBean.netProfit,'0')}" required readonly title="项目净利润上月结算总额"></td>
                         <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="netProfit" value="${Utils.format(monthBean.netProfit,'0')}" readonly required title="项目净利润本月结算金额"></td>
                         <td><input type="number" name="netProfitSettleTotal" value="${Utils.format(currentBean.netProfit,'0')}" readonly title="项目净利润结算总额"></td>
-                        <td><input name="netProfitProfitMargin" type="number" value="${Utils.format(100 * currentBean.netProfit / currentBean.getIncomeTotalTaxExclude(),'0')}" readonly title="项目净利润利润率"></td>
+                        <td><input name="netProfitProfitMargin" type="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>
                     </tr>
                     </tbody>
                 </table>
 
-                <span class="am-text-lg">现金流量表</span>
+                <span class="am-text-lg">结算现金流量表</span>
                 <table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;">
                     <tbody>
                     <tr class="am-text-xl">