From 541075c71614b1a87ba32e248699e79d2c0194b9 Mon Sep 17 00:00:00 2001
From: OathK1per <zhangypg@gmail.com>
Date: Fri, 3 Dec 2021 14:49:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A6=82=E7=AE=97=E4=B8=8E=E9=A2=84=E7=AE=97?=
 =?UTF-8?q?=E7=9A=84=E5=88=A9=E6=B6=A6=EF=BC=8C=E4=BA=BA=E5=8A=9B=E6=88=90?=
 =?UTF-8?q?=E6=9C=AC=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/backend/ProjectSettleController.java  |  5 +----
 .../work/model/ProjectUserTimeRepositoryImpl.java    |  4 ++--
 .../resources/templates/admin/project_settle_add.ftl | 12 ++++++------
 .../templates/admin/project_settle_edit.ftl          | 12 ++++++------
 4 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/src/main/java/cn/palmte/work/controller/backend/ProjectSettleController.java b/src/main/java/cn/palmte/work/controller/backend/ProjectSettleController.java
index 53b6646..dbb8c4e 100644
--- a/src/main/java/cn/palmte/work/controller/backend/ProjectSettleController.java
+++ b/src/main/java/cn/palmte/work/controller/backend/ProjectSettleController.java
@@ -1,9 +1,6 @@
 package cn.palmte.work.controller.backend;
 
-import cn.palmte.work.bean.BudgetSettleBean;
-import cn.palmte.work.bean.EstimateSettleBean;
-import cn.palmte.work.bean.FormerBean;
-import cn.palmte.work.bean.SettleBean;
+import cn.palmte.work.bean.*;
 import cn.palmte.work.model.*;
 import cn.palmte.work.service.ProjectBudgetService;
 import cn.palmte.work.service.ProjectEstimateService;
diff --git a/src/main/java/cn/palmte/work/model/ProjectUserTimeRepositoryImpl.java b/src/main/java/cn/palmte/work/model/ProjectUserTimeRepositoryImpl.java
index 08306a0..0bfda53 100644
--- a/src/main/java/cn/palmte/work/model/ProjectUserTimeRepositoryImpl.java
+++ b/src/main/java/cn/palmte/work/model/ProjectUserTimeRepositoryImpl.java
@@ -72,9 +72,9 @@ public class ProjectUserTimeRepositoryImpl implements ProjectUserTimeRepositoryC
         helper.addCondition(searchInfo.containsKey("projectId") && !"-1".equals(searchInfo.get("projectId")), "put.project_id = ?", searchInfo.get("projectId"));
         helper.addCondition(searchInfo.containsKey("deptId") && !"-1".equals(searchInfo.get("deptId")), "dept.id = ?", searchInfo.get("deptId"));
         helper.addCondition(searchInfo.containsKey("userName"), "put.user_name like ?", "%'" + searchInfo.get("userName") + "'%");
-        if (admin.getRoleId() >= 19 && admin.getRoleId() <= 20) {
+        if (admin.getRoleLevel() == 4 && admin.getRoleLevel() == 5) {
             helper.addCondition("proj.dept_id = ?", admin.getDeptId());
-        } else if (admin.getRoleId() > 20) {
+        } else if (admin.getRoleLevel() == 7) {
             helper.addCondition("proj.creator_id = ?", admin.getId());
         }
         return helper;
diff --git a/src/main/resources/templates/admin/project_settle_add.ftl b/src/main/resources/templates/admin/project_settle_add.ftl
index ae03ecf..2d2192d 100644
--- a/src/main/resources/templates/admin/project_settle_add.ftl
+++ b/src/main/resources/templates/admin/project_settle_add.ftl
@@ -247,8 +247,8 @@
                     </tr>
                     <tr>
                         <td>项目毛利</td>
-                        <td><input name="grossProfitEstimateTotal" type="number" value="${Utils.format(estimateBean.grossProfitTaxExclude,'0')}" required readonly title="项目毛利概算总额"></td>
-                        <td><input name="grossProfitBudgetTotal" type="number" value="${Utils.format(budgetBean.grossProfitTaxExclude,'0')}" required readonly title="项目毛利预算总额"></td>
+                        <td><input name="grossProfitEstimateTotal" type="number" value="${Utils.format(estimateBean.getProjectGrossProfit(),'0')}" required readonly title="项目毛利概算总额"></td>
+                        <td><input name="grossProfitBudgetTotal" type="number" value="${Utils.format(budgetBean.getProjectGrossProfit(),'0')}" required readonly title="项目毛利预算总额"></td>
                         <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" readonly required title="项目毛利本月结算金额"></td>
                         <td><input type="number" name="grossProfitSettleTotal" readonly title="项目毛利结算总额"></td>
@@ -256,8 +256,8 @@
                     </tr>
                     <tr>
                         <td>项目贡献利润</td>
-                        <td><input name="contributionProfitEstimateTotal" type="number" value="${Utils.format(estimateBean.contributionProfitTaxExclude,'0')}" required readonly title="项目贡献利润概算总额"></td>
-                        <td><input name="contributionProfitBudgetTotal" type="number" value="${Utils.format(budgetBean.contributionProfitTaxExclude,'0')}" required readonly title="项目贡献利润预算总额"></td>
+                        <td><input name="contributionProfitEstimateTotal" type="number" value="${Utils.format(estimateBean.getProjectContributionProfit(),'0')}" required readonly title="项目贡献利润概算总额"></td>
+                        <td><input name="contributionProfitBudgetTotal" type="number" value="${Utils.format(budgetBean.getProjectContributionProfit(),'0')}" required readonly title="项目贡献利润预算总额"></td>
                         <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" readonly required title="项目贡献利润本月结算金额"></td>
                         <td><input type="number" name="contributionProfitSettleTotal" readonly title="项目贡献利润结算总额"></td>
@@ -265,8 +265,8 @@
                     </tr>
                     <tr>
                         <td>项目净利润</td>
-                        <td><input name="netProfitBudgetTotal" type="number" value="${Utils.format(estimateBean.contributionProfitTaxExclude,'0')}" required readonly title="项目净利润预算总额"></td>
-                        <td><input name="netProfitBudgetTotal" type="number" value="${Utils.format(budgetBean.contributionProfitTaxExclude,'0')}" required readonly title="项目净利润预算总额"></td>
+                        <td><input name="netProfitEstimateTotal" type="number" value="${Utils.format(estimateBean.getProjectContributionProfit(),'0')}" required readonly title="项目净利润概算总额"></td>
+                        <td><input name="netProfitBudgetTotal" type="number" value="${Utils.format(budgetBean.getProjectContributionProfit(),'0')}" required readonly title="项目净利润预算总额"></td>
                         <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" readonly required title="项目净利润本月结算金额"></td>
                         <td><input type="number" name="netProfitSettleTotal" readonly title="项目净利润结算总额"></td>
diff --git a/src/main/resources/templates/admin/project_settle_edit.ftl b/src/main/resources/templates/admin/project_settle_edit.ftl
index 23f7beb..707493c 100644
--- a/src/main/resources/templates/admin/project_settle_edit.ftl
+++ b/src/main/resources/templates/admin/project_settle_edit.ftl
@@ -245,8 +245,8 @@
                     </tr>
                     <tr>
                         <td>项目毛利</td>
-                        <td><input name="grossProfitEstimateTotal" type="number" value="${Utils.format(estimateBean.grossProfitTaxExclude,'0')}" required readonly title="项目毛利概算总额"></td>
-                        <td><input name="grossProfitBudgetTotal" type="number" value="${Utils.format(budgetBean.grossProfitTaxExclude,'0')}" required readonly title="项目毛利预算总额"></td>
+                        <td><input name="grossProfitEstimateTotal" type="number" value="${Utils.format(estimateBean.getProjectGrossProfit(),'0')}" required readonly title="项目毛利概算总额"></td>
+                        <td><input name="grossProfitBudgetTotal" type="number" value="${Utils.format(budgetBean.getProjectGrossProfit(),'0')}" required readonly title="项目毛利预算总额"></td>
                         <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>
@@ -254,8 +254,8 @@
                     </tr>
                     <tr>
                         <td>项目贡献利润</td>
-                        <td><input name="contributionProfitEstimateTotal" type="number" value="${Utils.format(estimateBean.contributionProfitTaxExclude,'0')}" required readonly title="项目贡献利润概算总额"></td>
-                        <td><input name="contributionProfitBudgetTotal" type="number" value="${Utils.format(budgetBean.contributionProfitTaxExclude,'0')}" required readonly title="项目贡献利润预算总额"></td>
+                        <td><input name="contributionProfitEstimateTotal" type="number" value="${Utils.format(estimateBean.getProjectContributionProfit(),'0')}" required readonly title="项目贡献利润概算总额"></td>
+                        <td><input name="contributionProfitBudgetTotal" type="number" value="${Utils.format(budgetBean.getProjectContributionProfit(),'0')}" required readonly title="项目贡献利润预算总额"></td>
                         <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>
@@ -263,8 +263,8 @@
                     </tr>
                     <tr>
                         <td>项目净利润</td>
-                        <td>/</td>
-                        <td><input name="netProfitBudgetTotal" type="number" value="${Utils.format(budgetBean.netProfitTaxExclude,'0')}" required readonly title="项目净利润预算总额"></td>
+                        <td><input name="netProfitEstimateTotal" type="number" value="${Utils.format(estimateBean.getProjectContributionProfit(),'0')}" required readonly title="项目净利润概算总额"></td>
+                        <td><input name="netProfitBudgetTotal" type="number" value="${Utils.format(budgetBean.getProjectContributionProfit(),'0')}" required readonly title="项目净利润预算总额"></td>
                         <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>