8.16汇报后修改内容

ruoyi-admin/src/main/java/com/ruoyi/web/controller/branch/TBranchManageController.java

@@ -1,11 +1,17 @@
 package com.ruoyi.web.controller.branch;
 
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.ruoyi.branch.domain.TBranchPublicize;
 import com.ruoyi.branch.domain.TBranchStudy;
+import com.ruoyi.branch.domain.TFile;
 import com.ruoyi.branch.service.ITFileService;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.web.controller.branch.vo.ProfilesVO;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -34,11 +40,38 @@ import com.ruoyi.common.core.page.TableDataInfo;
 @RestController
 @RequestMapping("/branch/manage")
 public class TBranchManageController extends BaseController {
+
     @Autowired
     private ITBranchManageService tBranchManageService;
+
     @Autowired
     private ITFileService tFileService;
 
+
+    /**
+     * 查询支部党课学习资料管理列表（当年、当月）
+     */
+    @PreAuthorize("@ss.hasPermi('branch:manage:list')")
+    @GetMapping("/listCurrentYearMonth")
+    public AjaxResult listCurrentYearMonth()
+    {
+        Calendar calendar = Calendar.getInstance();//当前日期
+        int year = calendar.get(Calendar.YEAR);//年
+        int month = calendar.get(Calendar.MONTH) + 1;//月
+
+        TBranchManage tBranchManage = new TBranchManage();
+        tBranchManage.setYear(year + "");
+        tBranchManage.setMonthly(month + "");
+        List<TBranchManage> tBranchManages = tBranchManageService.selectTBranchManageList(tBranchManage);
+
+        TFile tFile = new TFile();
+        tFile.setTableName("branchManage");
+        tFile.setTableId(tBranchManages.get(0).getManageId());
+        List<TFile> tFiles = tFileService.selectTFileList(tFile);
+
+        return AjaxResult.success(tFiles);
+    }
+
     /**
      * 查询支部党课学习资料管理列表
      */

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

@@ -1,6 +1,11 @@
 package com.ruoyi.web.controller.system;
 
+import java.util.Calendar;
+import java.util.Date;
 import java.util.List;
+
+import com.ruoyi.branch.domain.TBranchPlanItem;
+import com.ruoyi.branch.service.ITBranchPlanItemService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
@@ -19,6 +24,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.system.domain.SysNotice;
 import com.ruoyi.system.service.ISysNoticeService;
+import sun.util.resources.cldr.af.CalendarData_af_NA;
 
 /**
  * 公告 信息操作处理
@@ -32,16 +38,43 @@ public class SysNoticeController extends BaseController
     @Autowired
     private ISysNoticeService noticeService;
 
+    @Autowired
+    private ITBranchPlanItemService planItemService;
+
     /**
      * 获取通知公告列表
      */
     @PreAuthorize("@ss.hasPermi('system:notice:list')")
     @GetMapping("/list")
-    public TableDataInfo list(SysNotice notice)
+    public AjaxResult list(SysNotice notice)
     {
-        startPage();
-        List<SysNotice> list = noticeService.selectNoticeList(notice);
-        return getDataTable(list);
+//        startPage();
+//        List<SysNotice> list = noticeService.selectNoticeList(notice);
+//        return getDataTable(list);
+        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;
+        System.out.println("30天：" + alarmTime);
+        System.out.println("计划日期\t当前日期\t计划日期毫秒\t当前日期毫秒\t时间差");
+
+        for (TBranchPlanItem tBranchPlanItem : tBranchPlanItems) {
+            long planTime = tBranchPlanItem.getPlanTime().getTime();
+            long difference = planTime - now;
+
+
+            System.out.println((tBranchPlanItem.getPlanTime().getYear() + 1900) + "-" + (tBranchPlanItem.getPlanTime().getMonth() + 1) + "-" + tBranchPlanItem.getPlanTime().getDate() + "\t" + "2023-08-21" + "\t" +planTime + "\t" + now + "\t" + difference);
+            if (difference > 0 && difference < alarmTime) {
+                SysNotice sysNotice = new SysNotice();
+                sysNotice.setCreateTime(tBranchPlanItem.getPlanTime());
+                sysNotice.setNoticeTitle(tBranchPlanItem.getItemContent());
+                sysNotices.add(sysNotice);
+            }
+        }
+        System.out.println(sysNotices.toString());
+        return AjaxResult.success(sysNotices);
     }
 
     /**

ruoyi-system/src/main/resources/mapper/branch/TBranchManageMapper.xml

@@ -37,6 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
+        order by u.monthly
     </select>
 
     <select id="selectTBranchManageByManageId" parameterType="Long" resultMap="TBranchManageResult">

ruoyi-ui/src/api/branch/manage.js

@@ -1,5 +1,13 @@
 import request from '@/utils/request'
 
+// 查询支部党课学习资料管理列表（当年、当月）
+export function listManageCurrentYearMonth() {
+  return request({
+    url: '/branch/manage/listCurrentYearMonth',
+    method: 'get'
+  })
+}
+
 // 查询支部党课学习资料管理列表
 export function listManage(query) {
   return request({

ruoyi-ui/src/assets/icons/svg/rectangleFlesh.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M920 789H104l-40-40V275l40-40h816l40 40v474l-40 40z" fill="#FABF8F"></path></svg>

ruoyi-ui/src/assets/icons/svg/rectangleGreen.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M920 789H104l-40-40V275l40-40h816l40 40v474l-40 40z" fill="#02b151"></path></svg>

ruoyi-ui/src/assets/icons/svg/rectangleLightgreen.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M920 789H104l-40-40V275l40-40h816l40 40v474l-40 40z" fill="#92D050"></path></svg>

ruoyi-ui/src/assets/icons/svg/rectangleYellow.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" width="400" height="400" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><style type="text/css"></style></defs><path d="M920 789H104l-40-40V275l40-40h816l40 40v474l-40 40z" fill="#FFFF00"></path></svg>

ruoyi-ui/src/assets/icons/svg/rectanglered.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M920 789H104l-40-40V275l40-40h816l40 40v474l-40 40z" fill="#cb0000"></path></svg>

ruoyi-ui/src/views/branch/manage/index.vue

@@ -333,6 +333,9 @@ export default {
         date: [
           {required: true, message: "月度不能为空", trigger: "blur"}
         ],
+        deptId: [
+          {required: true, message: "归属部门不能为空", trigger: "blur"}
+        ],
       }
     };
   },

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

@@ -37,6 +37,11 @@
       </el-form-item>
     </el-form>
 
+    <el-row class="colorMark">
+      <svg-icon icon-class="rectanglered" class="rectanglered"></svg-icon>1-15天内到期
+      <svg-icon icon-class="rectangleYellow" class="rectangleYellow"></svg-icon>16-30天内到期
+    </el-row>
+
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
@@ -51,7 +56,7 @@
 	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="planList" @selection-change="handleSelectionChange" :height="clientHeight" border :span-method="objectSpanMethod">
+    <el-table :cell-style="tableCellStyle" v-loading="loading" :data="planList" @selection-change="handleSelectionChange" :height="clientHeight" border :span-method="objectSpanMethod">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="标题" align="center" prop="planTitle" width="200" />
       <el-table-column label="内容" align="center" prop="itemContent"/>
@@ -254,7 +259,7 @@ export default {
       // 非多个禁用
       multiple: true,
       // 显示搜索条件
-      showSearch: true,
+      showSearch: false,
       // 总条数
       total: 0,
       planList: [],
@@ -349,6 +354,26 @@ export default {
     });
   },
   methods: {
+    // 单元格样式
+    tableCellStyle( {row, column, rowIndex, columnIndex} ) {
+      console.log(row.planTime)
+      if (columnIndex === 0 ||columnIndex === 7) {
+        return;
+      }
+      let today = new Date(); // 当前时间
+      let planTime = new Date(row.planTime);
+      if (today.getTime() < planTime.getTime()) {
+        let difference = planTime.getTime() - today.getTime(); // 时间差
+        if (row.planTime != null && row.planTime != '') {
+          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
+            && difference <= 30 * 24 * 60 * 60 * 1000) {  // 16 <= 到期时间 - 当前时间 <= 30
+            return "background-color: rgba(255, 255, 0, 1);";
+          }
+        }
+      }
+    },
     /** 设置搜索条件年份 */
     setYear() {
       this.queryParams.planYear = new Date();
@@ -677,4 +702,19 @@ export default {
     textarea {
         font-family: "Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB","Microsoft YaHei","微软雅黑",Arial,sans-serif;
     }
+    .colorMark {
+      color: #6f6f6f;
+      text-align: right;
+      font-weight:bold;
+      font-size: 13px;
+      padding-bottom: 5px;
+    }
+    .rectanglered {
+      width: 40px !important;
+      height: 20px !important;
+    }
+    .rectangleYellow {
+      width: 40px !important;
+      height: 20px !important;
+    }
 </style>

ruoyi-ui/src/views/dashboard/BrithChart.vue

@@ -69,10 +69,12 @@
   }
 </script>
 
-<style>
+<style scoped>
   .text-container {
     line-height: 30px;
     overflow: hidden;
+    background-color: rgba(255, 255, 255, 0.6);
+    padding-top: 10px;
   }
 
   .dangao {
@@ -89,6 +91,7 @@
     border-radius:5px 5px 5px 5px ;
     /*border: 2px solid rgba(41, 107, 155, 0.71);*/
     background-color: transparent;
+    border-bottom: 1px dashed #C0C0C0;
   }
 
   .allBirth {

ruoyi-ui/src/views/dashboard/DemeanorChart.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <div class="text-container" :style="{height:height,width:width}">
-      <ul class="allBirth">
+      <ul class="allDemeanor">
         <li v-for="(item,index) in demeanorList" class="info">
           <span style="padding-left: 20px">{{parseTime(item.createTime, '{yyyy}-{mm}-{dd}')}}</span>
           <span style="padding-left: 20px">{{item.demeanorTitle}}</span>
@@ -11,7 +11,7 @@
   </div>
 </template>
 
-<script>
+<script scoped>
   import { listDemeanor } from "@/api/branch/demeanor";
 
   const totalDuration = 2000;
@@ -48,7 +48,7 @@
           //判断是否需要滚动
           if (this.demeanorList.length > 4) {
             //设置文字滚动一轮时间
-            let elem = document.querySelector('.allBirth');
+            let elem = document.querySelector('.allDemeanor');
             let state = elem.style['animation'];
             let time = this.demeanorList.length * 2
             elem.style['animation'] = 'myMove ' + time + 's linear infinite';
@@ -69,10 +69,12 @@
   }
 </script>
 
-<style>
+<style scoped>
   .text-container {
     line-height: 30px;
     overflow: hidden;
+    background-color: rgba(255, 255, 255, 0.6);
+    padding-top: 10px;
   }
 
   .dangao {
@@ -89,9 +91,10 @@
     border-radius:5px 5px 5px 5px ;
     /*border: 2px solid rgba(41, 107, 155, 0.71);*/
     background-color: transparent;
+    border-bottom: 1px dashed #C0C0C0;
   }
 
-  .allBirth {
+  .allDemeanor {
     margin: -10px 0 0 0;
     padding: 0 20px 0 20px;
     /*animation: myMove 10s linear infinite;

ruoyi-ui/src/views/dashboard/ManageChart.vue

@@ -0,0 +1,163 @@
+<template>
+  <div>
+    <div class="text-container" :style="{height:height,width:width}">
+      <ul class="allManage">
+        <li v-for="(item,index) in manageList" class="info">
+          <!--<span style="padding-left: 20px">{{parseTime(item.createdate, '{yyyy}-{mm}-{dd}')}}</span>-->
+          <span id="manage-title" @click="handleSee(item.url)">{{item.name}}</span>
+        </li>
+      </ul>
+    </div>
+  </div>
+</template>
+
+<script>
+  import { listManageCurrentYearMonth } from "@/api/branch/manage";
+
+  const totalDuration = 2000;
+
+  export default {
+    name: "ManageChart",
+    props: {
+      width: {
+        type: String,
+        default: '100%'
+      },
+      height: {
+        type: String,
+        default: '210px'
+      }
+    },
+    data() {
+      return {
+        // 查询参数
+        queryParams: {},
+        // 学习资料列表
+        manageList: null,
+      }
+    },
+    created() {
+      this.listManage();
+    },
+    methods: {
+      handleSee(url) {
+        window.open(process.env.VUE_APP_BASE_API + url);
+      },
+      /** 查询学习资料列表 */
+      listManage() {
+        listManageCurrentYearMonth(this.queryParams).then(response => {
+          this.manageList = response.data;
+          console.log(response)
+          //判断是否需要滚动
+          if (this.manageList.length > 4) {
+            //设置文字滚动一轮时间
+            let elem = document.querySelector('.allManage');
+            let state = elem.style['animation'];
+            let time = this.manageList.length * 2
+            elem.style['animation'] = 'myMove ' + time + 's linear infinite';
+            let state1 = elem.style['animation-fill-mode'];
+            elem.style['animation-fill-mode'] = 'forwards';
+            //设置文字无缝滚动高度
+            let param = this.manageList.length * 50
+            let myFirstkeyframes = "@keyframes myMove{0% {transform: translateY(200px);}100% {transform: translateY(-" + param +"px);}}";
+            let style = document.createElement("style");
+            style.setAttribute("type", "text/css");
+            document.head.appendChild(style);
+            const sheet = style.sheet;
+            sheet.insertRule(myFirstkeyframes, 0);
+          }
+        });
+      },
+    }
+  }
+</script>
+
+<style scoped>
+  #manage-title {
+    padding-left: 20px;
+  }
+  #manage-title:hover {
+    cursor: pointer;
+  }
+  .text-container {
+    line-height: 30px;
+    overflow: hidden;
+    background-color: rgba(255, 255, 255, 0.6);
+    padding-top: 10px;
+  }
+
+  .dangao {
+    width: 40px !important;
+    height: 40px !important;
+  }
+
+  .info {
+    font-weight:bold;
+    list-style: none;
+    display: flex;
+    margin: 10px 0 0 0;
+    align-items: center;     /* 垂直居中 */
+    /*border-radius:5px 5px 5px 5px ;*/
+    /*border: 2px solid rgba(41, 107, 155, 0.71);*/
+    background-color: transparent;
+    border-bottom: 1px dashed #C0C0C0;
+  }
+
+  .allManage {
+    margin: -10px 0 0 0;
+    padding: 0 20px 0 20px;
+    /*animation: myMove 10s linear infinite;
+    animation-fill-mode: forwards;*/
+  }
+
+  /*文字无缝滚动*/
+  /*@keyframes myMove {
+    0% {
+      transform: translateY(200px);
+    }
+    100% {
+      transform: translateY(-300px);
+    }
+  }*/
+
+  /*文字停顿滚动*/
+  @keyframes myMove2 {
+    0% {
+      transform: translateY(0);
+    }
+    10% {
+      transform: translateY(-30px);
+    }
+    20% {
+      transform: translateY(-30px);
+    }
+    30% {
+      transform: translateY(-60px);
+    }
+    40% {
+      transform: translateY(-60px);
+    }
+    50% {
+      transform: translateY(-90px);
+    }
+    60% {
+      transform: translateY(-90px);
+    }
+    70% {
+      transform: translateY(-120px);
+    }
+    80% {
+      transform: translateY(-120px);
+    }
+    90% {
+      transform: translateY(-150px);
+    }
+    100% {
+      transform: translateY(-150px);
+    }
+  }
+
+  .info span {
+    padding-top: 5px;
+  }
+</style>

ruoyi-ui/src/views/dashboard/NoticeChart.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <div class="text-container" :style="{height:height,width:width}">
-      <ul class="allBirth">
+      <ul class="allNotice">
         <li v-for="(item,index) in noticeList" class="info">
           <span style="padding-left: 20px">{{parseTime(item.createTime, '{yyyy}-{mm}-{dd}')}}</span>
           <span style="padding-left: 20px">{{item.noticeTitle}}</span>
@@ -44,11 +44,11 @@
       listNotice() {
         this.queryParams.isPinned = 1;
         listNotice(this.queryParams).then(response => {
-          this.noticeList = response.rows;
+          this.noticeList = response.data;
           //判断是否需要滚动
           if (this.noticeList.length > 4) {
             //设置文字滚动一轮时间
-            let elem = document.querySelector('.allBirth');
+            let elem = document.querySelector('.allNotice');
             let state = elem.style['animation'];
             let time = this.noticeList.length * 2
             elem.style['animation'] = 'myMove ' + time + 's linear infinite';
@@ -69,7 +69,7 @@
   }
 </script>
 
-<style>
+<style scoped>
   .text-container {
     line-height: 30px;
     overflow: hidden;
@@ -94,7 +94,7 @@
     border-bottom: 1px dashed #C0C0C0;
   }
 
-  .allBirth {
+  .allNotice {
     margin: -10px 0 0 0;
     padding: 0 20px 0 20px;
     /*animation: myMove 10s linear infinite;

ruoyi-ui/src/views/index.vue

@@ -3,11 +3,12 @@
     <el-row :gutter="20">
       <el-col :xs="24" :sm="24" :md="12" :lg="8">
         <el-carousel direction="horizontal" height="250px" style="margin-bottom: 20px;">
-          <!-- 为了让走马灯在轮播图片的同时能够在上面附带文字，将走马灯组件单独放在一个 div 里
+          <!-- 为了让走马灯在轮播图片的同时能够在
+          上面附带文字，将走马灯组件单独放在一个 div 里
        		并且为这个 div 单独设计 css 样式 pic_item -->
           <div class="pic_item">
             <el-carousel-item v-for="(item, index) in publicizeUrls" :key="index">
-              <el-image :src="item.url" style="width: 100%; height: 100%;"></el-image>
+              <el-image :src="item.url" style="width: 100%; height: 100%;" @click="handleSee(item.url2)"></el-image>
               <h3>{{item.title}}</h3>
             </el-carousel-item>
           </div>
@@ -20,7 +21,7 @@
           </div>
           学习资料
         </div>
-        <demeanor-chart />
+        <manage-chart />
       </el-col>
       <el-col :xs="24" :sm="24" :md="12" :lg="8">
         <div class="title">
@@ -28,18 +29,8 @@
             <img src="../assets/logo/logo.png" alt="logo" />
           </div>常用下载
         </div>
-        <demeanor-chart />
+        <!--<demeanor-chart />-->
       </el-col>
-      <!--<el-col :xs="12" :sm="12" :md="12" :lg="12">-->
-        <!--<el-carousel direction="vertical" height="350px" style="margin-bottom: 20px;">-->
-          <!--<div class="pic_item">-->
-            <!--<el-carousel-item v-for="(item, index) in demeanorUrls" :key="index">-->
-              <!--<el-image :src="item.url" style="width: 100%; height: 100%;"></el-image>-->
-              <!--<h3>{{item.title}}</h3>-->
-            <!--</el-carousel-item>-->
-          <!--</div>-->
-        <!--</el-carousel>-->
-      <!--</el-col>-->
     </el-row>
     <el-row :gutter="20">
       <el-col :xs="24" :sm="24" :md="12" :lg="8">
@@ -77,18 +68,16 @@
 import BrithChart from "./dashboard/BrithChart";
 import DemeanorChart from "./dashboard/DemeanorChart";
 import NoticeChart from "./dashboard/NoticeChart";
+import ManageChart from "./dashboard/ManageChart";
 import { listPublicizeProfiles } from "@/api/branch/publicize";
-import { listDemeanorProfiles } from "@/api/branch/demeanor";
 
 export default {
   name: "Index",
-  components: { BrithChart, NoticeChart, DemeanorChart },
+  components: { BrithChart, NoticeChart, DemeanorChart, ManageChart },
   data() {
     return {
       // 支部园地宣传图片
       publicizeUrls: [],
-      // 支部园地风采图片
-      demeanorUrls: [],
       // 版本号
       version: "3.8.5",
     };
@@ -105,16 +94,6 @@ export default {
         });
       }
     });
-    /** 查询支部园地风采图片 */
-    listDemeanorProfiles().then(response => {
-      let profiles = response.data;
-      for (let i = 0; i < profiles.length; i++) {
-        this.demeanorUrls.push({
-          "url": process.env.VUE_APP_BASE_API + profiles[i].url,
-          "title": profiles[i].title
-        });
-      }
-    });
   },
   methods: {
     handleSee(url) {