From 06db8d613b816f125572f8b364230103346ccf7e Mon Sep 17 00:00:00 2001 From: hanbo <2608504783@qq.com> Date: Fri, 26 Nov 2021 19:19:35 +0800 Subject: [PATCH 1/4] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../backend/ProcurementTypeController.java | 2 +- .../cn/palmte/work/model/ProcurementType.java | 11 ++++++++ .../palmte/work/service/AccountService.java | 1 + .../work/service/ProcurementTypeService.java | 26 ++++++++++++++++++- .../templates/admin/project_approve.ftl | 2 +- 5 files changed, 39 insertions(+), 3 deletions(-) diff --git a/src/main/java/cn/palmte/work/controller/backend/ProcurementTypeController.java b/src/main/java/cn/palmte/work/controller/backend/ProcurementTypeController.java index 8127fc4..52282bd 100644 --- a/src/main/java/cn/palmte/work/controller/backend/ProcurementTypeController.java +++ b/src/main/java/cn/palmte/work/controller/backend/ProcurementTypeController.java @@ -133,7 +133,7 @@ public class ProcurementTypeController extends BaseController{ Map searchInfo = getSearchInfo(keywords); downloadHeader(httpServletResponse , Utils.generateExcelName("采购类型表"), "application/octet-stream"); String[] headers = {"采购类型名称","所属大类","创建人","创建时间"}; - String[] exportColumns = {"name","category","createdBy","createdTime"}; + String[] exportColumns = {"name","typeName","createdBy","createdTime"}; ExportUtils.exportToExcel(headers, exportColumns, 1, 10000, httpServletResponse.getOutputStream(), (pN, pS) -> procurementTypeService.list(searchInfo, pN, pS).getList()); } diff --git a/src/main/java/cn/palmte/work/model/ProcurementType.java b/src/main/java/cn/palmte/work/model/ProcurementType.java index 7605a57..27e1f55 100644 --- a/src/main/java/cn/palmte/work/model/ProcurementType.java +++ b/src/main/java/cn/palmte/work/model/ProcurementType.java @@ -32,6 +32,9 @@ public class ProcurementType { @Column(name = "created_by") private String createdBy; + @Transient + private String typeName; + /** * 创建时间 */ @@ -39,6 +42,14 @@ public class ProcurementType { @Temporal(TemporalType.TIMESTAMP) private Date createdTime; + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + public Integer getId() { return id; } diff --git a/src/main/java/cn/palmte/work/service/AccountService.java b/src/main/java/cn/palmte/work/service/AccountService.java index 34473c6..cf4afb2 100644 --- a/src/main/java/cn/palmte/work/service/AccountService.java +++ b/src/main/java/cn/palmte/work/service/AccountService.java @@ -412,6 +412,7 @@ public class AccountService { admin.setCreatedTime(new Date()); admin.setLastUpdatedBy(createAdminId); admin.setLastUpdatedTime(new Date()); + admin.setEnabled(1); adminRepository.saveAndFlush(admin); //设置当前用户角色关系状态为删除 diff --git a/src/main/java/cn/palmte/work/service/ProcurementTypeService.java b/src/main/java/cn/palmte/work/service/ProcurementTypeService.java index 1ef1cbf..e0ca85d 100644 --- a/src/main/java/cn/palmte/work/service/ProcurementTypeService.java +++ b/src/main/java/cn/palmte/work/service/ProcurementTypeService.java @@ -8,6 +8,7 @@ import org.springframework.stereotype.Service; import top.jfunc.common.db.QueryHelper; import top.jfunc.common.db.bean.Page; import top.jfunc.common.db.utils.Pagination; +import top.jfunc.common.utils.CollectionUtil; import java.util.Date; import java.util.List; @@ -33,7 +34,30 @@ public class ProcurementTypeService { queryHelper.addCondition(searchInfo.containsKey("startTime"), "created_time >= ?", searchInfo.get("startTime") + " 00:00:00"); queryHelper.addCondition(searchInfo.containsKey("endTime"), "created_time <= ?", searchInfo.get("endTime") + " 23:59:59"); queryHelper.addOrderProperty("created_time", false); - return pagination.paginate(queryHelper.getSql(), ProcurementType.class,pageNumber,pageSize); + Page paginate = pagination.paginate(queryHelper.getSql(), ProcurementType.class, pageNumber, pageSize); + List list = paginate.getList(); + typeName(list); + paginate.setList(list); + return paginate; + } + + public void typeName(List list){ + if(CollectionUtil.isNotEmpty(list)){ + for (ProcurementType procurementType : list) { + if(procurementType.getType() == 1){ + procurementType.setTypeName("设备"); + } + if(procurementType.getType() == 2){ + procurementType.setTypeName("服务"); + } + if(procurementType.getType() == 3){ + procurementType.setTypeName("施工"); + } + if(procurementType.getType() == 4){ + procurementType.setTypeName("其他"); + } + } + } } public ProcurementType findOne(int id) { diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl index 8e8dc4d..08f26a2 100644 --- a/src/main/resources/templates/admin/project_approve.ftl +++ b/src/main/resources/templates/admin/project_approve.ftl @@ -83,7 +83,7 @@ font-size: 14px; } .approve-nopass:after { - content:"审核不过"; + content:"审核不通过"; } From 532d9843a050fdf2100bf526cc5bddba66c2950f Mon Sep 17 00:00:00 2001 From: pengqiang <1067496116@qq.com> Date: Mon, 29 Nov 2021 09:52:21 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E9=87=8C=E7=9A=84=E9=A2=84=E7=AE=97=E5=AE=A1=E6=A0=B8=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/admin/project_approve.ftl | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl index 08f26a2..8612d96 100644 --- a/src/main/resources/templates/admin/project_approve.ftl +++ b/src/main/resources/templates/admin/project_approve.ftl @@ -407,13 +407,13 @@
- <#if (project.status==5 || project.status==10 || project.status==15) && project.approveStatusEstimate == 1> + <#if (project.status==5 || project.status==10 || project.status==15) && project.approveStatusBudget == 1>
- <#if (project.status==5 || project.status==10 || project.status==15) && project.approveStatusEstimate == 2> + <#if (project.status==5 || project.status==10 || project.status==15) && project.approveStatusBudget == 2>
- <#if (project.status==5 || project.status==10 || project.status==15) && project.approveStatusEstimate == 3> + <#if (project.status==5 || project.status==10 || project.status==15) && project.approveStatusBudget == 3>
收入 @@ -630,13 +630,13 @@
- <#if (project.status==10 || project.status==15) && project.approveStatusEstimate == 1> + <#if (project.status==10 || project.status==15) && project.approveStatusSettle == 1>
- <#if (project.status==10 || project.status==15) && project.approveStatusEstimate == 2> + <#if (project.status==10 || project.status==15) && project.approveStatusSettle == 2>
- <#if (project.status==10 || project.status==15) && project.approveStatusEstimate == 3> + <#if (project.status==10 || project.status==15) && project.approveStatusSettle == 3>
@@ -1002,13 +1002,13 @@
- <#if project.status ==15 && project.approveStatusEstimate == 1> + <#if project.status ==15 && project.approveStatusFinal == 1>
- <#if project.status ==15 && project.approveStatusEstimate == 2> + <#if project.status ==15 && project.approveStatusFinal == 2>
- <#if project.status ==15 && project.approveStatusEstimate == 3> + <#if project.status ==15 && project.approveStatusFinal == 3>
From 2792d488d10843bcea2d81b59067f147e4389880 Mon Sep 17 00:00:00 2001 From: pengqiang <1067496116@qq.com> Date: Mon, 29 Nov 2021 11:04:21 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=BE=85=E5=AE=A1=E6=A0=B8=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E9=80=9A=E7=9F=A5=E8=B7=91=E9=A9=AC=E7=81=AF=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E5=90=8E=E9=9A=90=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/templates/common/header.ftl | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/main/resources/templates/common/header.ftl b/src/main/resources/templates/common/header.ftl index d7eaa9c..a5fa8da 100644 --- a/src/main/resources/templates/common/header.ftl +++ b/src/main/resources/templates/common/header.ftl @@ -19,7 +19,13 @@
+ From 5d2976e9f3855e0fbec97e76b38e949c03ede5ca Mon Sep 17 00:00:00 2001 From: OathK1per Date: Mon, 29 Nov 2021 13:19:11 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=BA=E5=8A=9B?= =?UTF-8?q?=E6=88=90=E6=9C=AC=E6=A8=A1=E6=9D=BF=E5=92=8C=E7=BB=93=E7=AE=97?= =?UTF-8?q?=E9=A1=B5=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 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="项目净利润利润率">
- 现金流量表 + 结算现金流量表