支部活动公告在首页“公示公告”模块滚动显示

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java

@@ -3,7 +3,9 @@ package com.ruoyi.web.controller.system;
 import java.util.Calendar;
 import java.util.List;
 
+import com.ruoyi.branch.domain.TBranchActivityNotice;
 import com.ruoyi.branch.domain.TBranchPlanItem;
+import com.ruoyi.branch.service.ITBranchActivityNoticeService;
 import com.ruoyi.branch.service.ITBranchPlanItemService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -39,6 +41,9 @@ public class SysNoticeController extends BaseController
     @Autowired
     private ITBranchPlanItemService planItemService;
 
+    @Autowired
+    private ITBranchActivityNoticeService activityNoticeService;
+
     /**
      * 获取通知公告列表（不分页）
      */
@@ -46,7 +51,10 @@ public class SysNoticeController extends BaseController
     @GetMapping("/listNoPage")
     public AjaxResult listNoPage(SysNotice notice)
     {
+        // 公示公告
         List<SysNotice> sysNotices = noticeService.selectNoticeList(notice);
+
+        // 工作提醒
         List<TBranchPlanItem> tBranchPlanItems = planItemService.selectTBranchPlanItemList(new TBranchPlanItem());
         long now = Calendar.getInstance().getTimeInMillis();
         long alarmTime = 30 * 24 * 60 * 60 * 1000L;
@@ -60,6 +68,19 @@ public class SysNoticeController extends BaseController
                 sysNotices.add(sysNotice);
             }
         }
+
+        // 活动预告
+        List<TBranchActivityNotice> tBranchActivityNotices = activityNoticeService.selectTBranchActivityNoticeList(new TBranchActivityNotice());
+        for (TBranchActivityNotice tBranchActivityNotice : tBranchActivityNotices) {
+            long activityTime = tBranchActivityNotice.getActivityTime().getTime();
+            if (activityTime > now) {
+                SysNotice sysNotice = new SysNotice();
+                sysNotice.setReleaseTime(tBranchActivityNotice.getActivityTime());
+                sysNotice.setNoticeTitle(tBranchActivityNotice.getActivityVenue() + "即将开展支部活动");
+                sysNotices.add(sysNotice);
+            }
+        }
+
         return AjaxResult.success(sysNotices);
     }
 

ruoyi-ui/src/views/index.vue

@@ -39,7 +39,7 @@
           <div class="logo">
             <img src="../assets/logo/logo.png" alt="logo" />
           </div>
-          公示公告、工作提醒
+          公示公告、工作提醒、活动预告
         </div>
         <notice-chart />
       </el-col>