logo展示

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<Project> page = pagination.paginate(queryHelper.getSql(), Project.class, pageNumber, pageSize);
+        List<Project> 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;
     }
 
 

src/main/resources/static/assets/css/admin.css

@@ -20,7 +20,8 @@ ul {
 
 
 .admin-ir-logo {
-
+  width: 500px;
+  display: flex;
 }
 
 .admin-ir-logo h1 {

src/main/resources/templates/common/header.ftl

@@ -1,6 +1,6 @@
 <header class="am-header-fixed am-topbar am-topbar-inverse admin-header">
     <h1 class="am-topbar-brand admin-ir-logo ">
-        <a href="#" class="am-text-ir">后台管理系统</a>
+        <a href="#" class="am-text-ir"></a>项目管理信息系统(PMS)
     </h1>
     <button class="am-topbar-btn am-topbar-toggle am-btn am-btn-sm am-btn-success am-show-sm-only" data-am-collapse="{target: '#topbar-collapse'}">
         <span class="am-sr-only">导航切换</span> <span class="am-icon-bars"></span></button>