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 data) { - List 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 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 @@ 项目管理成本 - + + 人力成本:${Utils.format(salary,'0')} 元 - @@ -275,7 +275,7 @@ - 现金流量表 + 结算现金流量表 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 @@ - + @@ -259,7 +259,7 @@ - + @@ -268,12 +268,12 @@ - +
value="${Utils.format(100 * currentBean.grossProfit,'0')}"<#else>value="${Utils.format(100 * currentBean.grossProfit / currentBean.getIncomeTotalTaxExclude(),'0')}" readonly title="项目毛利利润率">
项目贡献利润 value="${Utils.format(100 * currentBean.grossProfit,'0')}"<#else>value="${Utils.format(100 * currentBean.grossProfit / currentBean.getIncomeTotalTaxExclude(),'0')}" readonly title="项目贡献利润利润率">
项目净利润 value="${Utils.format(100 * currentBean.grossProfit,'0')}"<#else>value="${Utils.format(100 * currentBean.grossProfit / currentBean.getIncomeTotalTaxExclude(),'0')}" readonly title="项目净利润利润率">
- 现金流量表 + 结算现金流量表