diff --git a/src/main/java/cn/palmte/work/service/ProjectService.java b/src/main/java/cn/palmte/work/service/ProjectService.java index 552267e..ab658da 100644 --- a/src/main/java/cn/palmte/work/service/ProjectService.java +++ b/src/main/java/cn/palmte/work/service/ProjectService.java @@ -297,7 +297,25 @@ public class ProjectService { QueryHelper queryHelper = getQueryHelper(searchInfo); //在列表基础上增加审核人是我 queryHelper.addCondition("p.approve_id=?", adminId); - return pagination.paginate(queryHelper.getSql(), Project.class,pageNumber,pageSize); + Page page = pagination.paginate(queryHelper.getSql(), Project.class, pageNumber, pageSize); + List list = page.getList(); + if(CollectionUtil.isNotEmpty(list)) { + //查询项目当前审批任务节点 + for (Project project : list) { + if (project.getApproveStatusBudget() > -1 && project.getIsBudget() == 1) { + project.setContractRound(project.getContractRound2()); + project.setHuizhiRound(project.getHuizhiRound2()); + project.setHuazhiRound(project.getHuazhiRound2()); + project.setHuasanRound(project.getHuasanRound2()); + project.setZiguangRound(project.getZiguangRound2()); + project.setGrossProfitRound(project.getGrossProfitRound2()); + project.setGrossProfitMarginRound(project.getGrossProfitMarginRound2()); + project.setAdvancePeakAmountRound(project.getAdvancePeakAmountRound2()); + project.setAdvanceInterestAmountRound(project.getAdvanceInterestAmountRound2()); + } + } + } + return page; } diff --git a/src/main/resources/static/assets/css/admin.css b/src/main/resources/static/assets/css/admin.css index a13ab53..2a5e286 100644 --- a/src/main/resources/static/assets/css/admin.css +++ b/src/main/resources/static/assets/css/admin.css @@ -20,7 +20,8 @@ ul { .admin-ir-logo { - + width: 500px; + display: flex; } .admin-ir-logo h1 { diff --git a/src/main/resources/templates/common/header.ftl b/src/main/resources/templates/common/header.ftl index 62711de..1321c61 100644 --- a/src/main/resources/templates/common/header.ftl +++ b/src/main/resources/templates/common/header.ftl @@ -1,6 +1,6 @@

- 后台管理系统 + 项目管理信息系统(PMS)