From b939e750c1b40204382341d6378940aded4a84bd Mon Sep 17 00:00:00 2001
From: pengqiang <1067496116@qq.com>
Date: Thu, 30 Dec 2021 16:14:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E6=B6=88=E6=81=AF=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/backend/AdminController.java   | 19 ++++++++++++++---
 .../resources/templates/admin/admin_index.ftl | 21 +++++++++++++++++++
 .../templates/admin/project_approve.ftl       | 21 ++++++++++++++++++-
 .../resources/templates/common/header.ftl     |  2 +-
 4 files changed, 58 insertions(+), 5 deletions(-)

diff --git a/src/main/java/cn/palmte/work/controller/backend/AdminController.java b/src/main/java/cn/palmte/work/controller/backend/AdminController.java
index 633bb3c..13783ab 100644
--- a/src/main/java/cn/palmte/work/controller/backend/AdminController.java
+++ b/src/main/java/cn/palmte/work/controller/backend/AdminController.java
@@ -1,6 +1,7 @@
 package cn.palmte.work.controller.backend;
 
 
+import cn.palmte.work.bean.ResponseMsg;
 import cn.palmte.work.config.Constant;
 import cn.palmte.work.model.*;
 import cn.palmte.work.pojo.LoginRequest;
@@ -153,9 +154,6 @@ public class AdminController extends BaseController {
             adminService.updateLoginInfo(admin, request);
             loginLogService.saveLog(userName, LoginLog.SUCCESS, "登录成功");
 
-            Page<Project> myApproveProjects = projectService.findMyApproveProjects(new HashMap<>(), InterfaceUtil.getAdminId(), 1, 1);
-            request.getSession().setAttribute("hasApproveProjectsMessage", CollectionUtil.isNotEmpty(myApproveProjects.getList())?"您有新的待审核项目，请及时确认。":"");
-
             /**
              * admin用户去检查,如果检查job有失败的,显示弹出框[1]
              */
@@ -286,5 +284,20 @@ public class AdminController extends BaseController {
         new CaptchaUtils().getRandCode(request, response);
     }
 
+    /**
+     * 查询自己是否有审核任务
+     *
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping("/approveProjectsMsg")
+    public ResponseMsg approveProjectsMsg() {
+        Page<Project> myApproveProjects = projectService.findMyApproveProjects(new HashMap<>(), InterfaceUtil.getAdminId(), 1, 1);
+        if (myApproveProjects != null && !myApproveProjects.getList().isEmpty()) {
+            return ResponseMsg.buildSuccessMsg("您有新的待审核项目，请及时确认。");
+        } else {
+            return ResponseMsg.buildSuccessMsg("");
+        }
+    }
 
 }
diff --git a/src/main/resources/templates/admin/admin_index.ftl b/src/main/resources/templates/admin/admin_index.ftl
index bb498ca..b22fb57 100644
--- a/src/main/resources/templates/admin/admin_index.ftl
+++ b/src/main/resources/templates/admin/admin_index.ftl
@@ -92,6 +92,25 @@
         });
     });
 
+    /**
+     * 刷新审批更新 更新跑马灯
+     */
+    function refreshApproveMsg() {
+        var span = $("#myMsgSpan", parent.document);
+        $.ajax({
+            url: '${base}/admin/approveProjectsMsg',
+            dataType: "json",
+            contentType: "application/json",
+            type: 'post',
+            async: false,
+            success: function (data) {
+                if (data.status == 0) {
+                    span.text(data.msg)
+                }
+            }
+        });
+    }
+
     $(function(){
         $("#arrow").on("click",function(){
             if($(this).hasClass("arrow-left")){
@@ -111,6 +130,8 @@
                 $(this).popover('setContent', '点击显示菜单栏');
             }
         });
+
+        refreshApproveMsg();
     });
 </script>
 </body>
diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl
index da2232c..8e1d3a0 100644
--- a/src/main/resources/templates/admin/project_approve.ftl
+++ b/src/main/resources/templates/admin/project_approve.ftl
@@ -1954,10 +1954,10 @@
             type: 'post',
             async: false,
             success: function (data) {
-                $("#marqueeLi", parent.document).addClass("am-hide");
                 if (data.status == 0) {
                     alert(data.msg);
                     window.location.href = window.location.href;
+                    refreshMyApproveMsg();
                 } else if (data.status == 1) {
                     alert(data.msg);
                 }
@@ -1997,4 +1997,23 @@
 
         $("#keywords").val(keywords);
     }
+
+    /**
+     * 刷新审批更新 更新跑马灯
+     */
+    function refreshMyApproveMsg() {
+        var span = $("#myMsgSpan", parent.document);
+        $.ajax({
+            url: '${base}/admin/approveProjectsMsg',
+            dataType: "json",
+            contentType: "application/json",
+            type: 'post',
+            async: false,
+            success: function (data) {
+                if (data.status == 0) {
+                    span.text(data.msg)
+                }
+            }
+        });
+    }
 </script>
\ No newline at end of file
diff --git a/src/main/resources/templates/common/header.ftl b/src/main/resources/templates/common/header.ftl
index f6ee46d..62711de 100644
--- a/src/main/resources/templates/common/header.ftl
+++ b/src/main/resources/templates/common/header.ftl
@@ -22,7 +22,7 @@
 
                 <li id="marqueeLi"  style="margin-top: -10px">
                     <marquee align="left" behavior="scroll" direction="left" height="20" width="200" hspace="50" vspace="20" loop="-1" scrollamount="10" scrolldelay="100" onMouseOut="this.start()" onMouseOver="this.stop()">
-                        <a href="${base}/project/listApprove" target="mainFrame">${hasApproveProjectsMessage!""}</a>
+                        <a href="${base}/project/listApprove" target="mainFrame"><span id="myMsgSpan"></span></a>
                     </marquee>
                 </li>