年度工作计划 - 状态为已完成的条目从首页移除，台账不标红

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

@@ -50,10 +50,11 @@ public class SysNoticeController extends BaseController
         List<TBranchPlanItem> tBranchPlanItems = planItemService.selectTBranchPlanItemList(new TBranchPlanItem());
         long now = Calendar.getInstance().getTimeInMillis();
         long alarmTime = 30 * 24 * 60 * 60 * 1000L;
+        System.out.println(alarmTime);
         for (TBranchPlanItem tBranchPlanItem : tBranchPlanItems) {
             long planTime = tBranchPlanItem.getPlanTime().getTime();
             long difference = planTime - now;
-            if (difference > 0 && difference < alarmTime) {
+            if (difference > 0 && difference < alarmTime && !(tBranchPlanItem.getItemStatus().equals("1"))) {
                 SysNotice sysNotice = new SysNotice();
                 sysNotice.setCreateTime(tBranchPlanItem.getPlanTime());
                 sysNotice.setNoticeTitle(tBranchPlanItem.getItemContent());

ruoyi-ui/src/views/branch/zbjs/plan/index.vue

@@ -364,7 +364,7 @@ export default {
       let planTime = new Date(row.planTime);
       if (today.getTime() < planTime.getTime()) {
         let difference = planTime.getTime() - today.getTime(); // 时间差
-        if (row.planTime != null && row.planTime != '') {
+        if (row.planTime != null && row.planTime != '' && row.itemStatus != '1') {
           if (difference < 16 * 24 * 60 * 60 * 1000) {  // 到期时间 - 当前时间 < 16
             return "background-color: rgba(203, 0, 0, 1); color: rgb(255, 255, 255);";
           } else if (difference >= 16 * 24 * 60 * 60 * 1000