8.16汇报后修改内容

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

@@ -47,7 +47,6 @@ public class TBranchManageController extends BaseController {
     @Autowired
     private ITFileService tFileService;
 
-
     /**
      * 查询支部党课学习资料管理列表（当年、当月）
      */

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

@@ -0,0 +1,134 @@
+package com.ruoyi.web.controller.branch;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.branch.domain.TBranchPublicize;
+import com.ruoyi.branch.domain.TFile;
+import com.ruoyi.branch.service.ITFileService;
+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;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.branch.domain.TBranchTemplate;
+import com.ruoyi.branch.service.ITBranchTemplateService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 常用模板Controller
+ * 
+ * @author ruoyi
+ * @date 2023-08-21
+ */
+@RestController
+@RequestMapping("/branch/template")
+public class TBranchTemplateController extends BaseController
+{
+    @Autowired
+    private ITBranchTemplateService tBranchTemplateService;
+
+    @Autowired
+    private ITFileService fileService;
+
+    /**
+     * 查询常用模板列表（不分页）
+     */
+    @PreAuthorize("@ss.hasPermi('branch:template:list')")
+    @GetMapping("/listNoPage")
+    public AjaxResult listNoPage(TBranchTemplate tBranchTemplate)
+    {
+        List<TBranchTemplate> tBranchTemplateList = tBranchTemplateService.selectTBranchTemplateList(tBranchTemplate);
+        List<TFile> tFileList = new ArrayList<>();
+        for (TBranchTemplate branchTemplate : tBranchTemplateList) {
+            TFile tFile = new TFile();
+            tFile.setTableName("branchTemplate");
+            tFile.setTableId(branchTemplate.getTemplateId());
+            List<TFile> tFiles = fileService.selectTFileList(tFile);
+            if (tFiles != null) {
+                tFileList.add(tFiles.get(0));
+            }
+        }
+        return AjaxResult.success(tFileList);
+    }
+
+    /**
+     * 查询常用模板列表
+     */
+    @PreAuthorize("@ss.hasPermi('branch:template:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TBranchTemplate tBranchTemplate)
+    {
+        startPage();
+        List<TBranchTemplate> list = tBranchTemplateService.selectTBranchTemplateList(tBranchTemplate);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出常用模板列表
+     */
+    @PreAuthorize("@ss.hasPermi('branch:template:export')")
+    @Log(title = "常用模板", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, TBranchTemplate tBranchTemplate)
+    {
+        List<TBranchTemplate> list = tBranchTemplateService.selectTBranchTemplateList(tBranchTemplate);
+        ExcelUtil<TBranchTemplate> util = new ExcelUtil<TBranchTemplate>(TBranchTemplate.class);
+        util.exportExcel(response, list, "常用模板数据");
+    }
+
+    /**
+     * 获取常用模板详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('branch:template:query')")
+    @GetMapping(value = "/{templateId}")
+    public AjaxResult getInfo(@PathVariable("templateId") Long templateId)
+    {
+        return success(tBranchTemplateService.selectTBranchTemplateByTemplateId(templateId));
+    }
+
+    /**
+     * 新增常用模板
+     */
+    @PreAuthorize("@ss.hasPermi('branch:template:add')")
+    @Log(title = "常用模板", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TBranchTemplate tBranchTemplate)
+    {
+        return toAjax(tBranchTemplateService.insertTBranchTemplate(tBranchTemplate));
+    }
+
+    /**
+     * 修改常用模板
+     */
+    @PreAuthorize("@ss.hasPermi('branch:template:edit')")
+    @Log(title = "常用模板", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TBranchTemplate tBranchTemplate)
+    {
+        return toAjax(tBranchTemplateService.updateTBranchTemplate(tBranchTemplate));
+    }
+
+    /**
+     * 删除常用模板
+     */
+    @PreAuthorize("@ss.hasPermi('branch:template:remove')")
+    @Log(title = "常用模板", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{templateIds}")
+    public AjaxResult remove(@PathVariable Long[] templateIds)
+    {
+        return toAjax(tBranchTemplateService.deleteTBranchTemplateByTemplateIds(templateIds));
+    }
+}

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

@@ -1,7 +1,6 @@
 package com.ruoyi.web.controller.system;
 
 import java.util.Calendar;
-import java.util.Date;
 import java.util.List;
 
 import com.ruoyi.branch.domain.TBranchPlanItem;
@@ -24,7 +23,6 @@ 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;
 
 /**
  * 公告 信息操作处理
@@ -42,30 +40,19 @@ public class SysNoticeController extends BaseController
     private ITBranchPlanItemService planItemService;
 
     /**
-     * 获取通知公告列表
+     * 获取通知公告列表（不分页）
      */
     @PreAuthorize("@ss.hasPermi('system:notice:list')")
-    @GetMapping("/list")
-    public AjaxResult list(SysNotice notice)
+    @GetMapping("/listNoPage")
+    public AjaxResult listNoPage(SysNotice notice)
     {
-//        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());
@@ -73,10 +60,21 @@ public class SysNoticeController extends BaseController
                 sysNotices.add(sysNotice);
             }
         }
-        System.out.println(sysNotices.toString());
         return AjaxResult.success(sysNotices);
     }
 
+    /**
+     * 获取通知公告列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:notice:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SysNotice notice)
+    {
+        startPage();
+        List<SysNotice> list = noticeService.selectNoticeList(notice);
+        return getDataTable(list);
+    }
+
     /**
      * 根据通知公告编号获取详细信息
      */

ruoyi-system/src/main/java/com/ruoyi/branch/domain/TBranchTemplate.java

@@ -0,0 +1,87 @@
+package com.ruoyi.branch.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 常用模板对象 t_branch_template
+ * 
+ * @author ruoyi
+ * @date 2023-08-21
+ */
+public class TBranchTemplate extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键id */
+    @Excel(name = "主键id")
+    private Long templateId;
+
+    /** 模板名称 */
+    @Excel(name = "模板名称")
+    private String templateName;
+
+    /** 部门id */
+    @Excel(name = "部门id")
+    private Long deptId;
+
+    /** 删除标志（0代表存在 2代表删除） */
+    private String delFlag;
+
+    public void setTemplateId(Long templateId) 
+    {
+        this.templateId = templateId;
+    }
+
+    public Long getTemplateId() 
+    {
+        return templateId;
+    }
+
+    public void setTemplateName(String templateName) 
+    {
+        this.templateName = templateName;
+    }
+
+    public String getTemplateName() 
+    {
+        return templateName;
+    }
+
+    public void setDeptId(Long deptId) 
+    {
+        this.deptId = deptId;
+    }
+
+    public Long getDeptId() 
+    {
+        return deptId;
+    }
+
+    public void setDelFlag(String delFlag) 
+    {
+        this.delFlag = delFlag;
+    }
+
+    public String getDelFlag() 
+    {
+        return delFlag;
+    }
+
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("templateId", getTemplateId())
+            .append("templateName", getTemplateName())
+            .append("deptId", getDeptId())
+            .append("delFlag", getDelFlag())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/branch/mapper/TBranchTemplateMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.branch.mapper;
+
+import java.util.List;
+import com.ruoyi.branch.domain.TBranchTemplate;
+
+/**
+ * 常用模板Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2023-08-21
+ */
+public interface TBranchTemplateMapper 
+{
+    /**
+     * 查询常用模板
+     * 
+     * @param templateId 常用模板主键
+     * @return 常用模板
+     */
+    public TBranchTemplate selectTBranchTemplateByTemplateId(Long templateId);
+
+    /**
+     * 查询常用模板列表
+     * 
+     * @param tBranchTemplate 常用模板
+     * @return 常用模板集合
+     */
+    public List<TBranchTemplate> selectTBranchTemplateList(TBranchTemplate tBranchTemplate);
+
+    /**
+     * 新增常用模板
+     * 
+     * @param tBranchTemplate 常用模板
+     * @return 结果
+     */
+    public int insertTBranchTemplate(TBranchTemplate tBranchTemplate);
+
+    /**
+     * 修改常用模板
+     * 
+     * @param tBranchTemplate 常用模板
+     * @return 结果
+     */
+    public int updateTBranchTemplate(TBranchTemplate tBranchTemplate);
+
+    /**
+     * 删除常用模板
+     * 
+     * @param templateId 常用模板主键
+     * @return 结果
+     */
+    public int deleteTBranchTemplateByTemplateId(Long templateId);
+
+    /**
+     * 批量删除常用模板
+     * 
+     * @param templateIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteTBranchTemplateByTemplateIds(Long[] templateIds);
+}

ruoyi-system/src/main/java/com/ruoyi/branch/service/ITBranchTemplateService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.branch.service;
+
+import java.util.List;
+import com.ruoyi.branch.domain.TBranchTemplate;
+
+/**
+ * 常用模板Service接口
+ * 
+ * @author ruoyi
+ * @date 2023-08-21
+ */
+public interface ITBranchTemplateService 
+{
+    /**
+     * 查询常用模板
+     * 
+     * @param templateId 常用模板主键
+     * @return 常用模板
+     */
+    public TBranchTemplate selectTBranchTemplateByTemplateId(Long templateId);
+
+    /**
+     * 查询常用模板列表
+     * 
+     * @param tBranchTemplate 常用模板
+     * @return 常用模板集合
+     */
+    public List<TBranchTemplate> selectTBranchTemplateList(TBranchTemplate tBranchTemplate);
+
+    /**
+     * 新增常用模板
+     * 
+     * @param tBranchTemplate 常用模板
+     * @return 结果
+     */
+    public int insertTBranchTemplate(TBranchTemplate tBranchTemplate);
+
+    /**
+     * 修改常用模板
+     * 
+     * @param tBranchTemplate 常用模板
+     * @return 结果
+     */
+    public int updateTBranchTemplate(TBranchTemplate tBranchTemplate);
+
+    /**
+     * 批量删除常用模板
+     * 
+     * @param templateIds 需要删除的常用模板主键集合
+     * @return 结果
+     */
+    public int deleteTBranchTemplateByTemplateIds(Long[] templateIds);
+
+    /**
+     * 删除常用模板信息
+     * 
+     * @param templateId 常用模板主键
+     * @return 结果
+     */
+    public int deleteTBranchTemplateByTemplateId(Long templateId);
+}

ruoyi-system/src/main/java/com/ruoyi/branch/service/impl/TBranchTemplateServiceImpl.java

@@ -0,0 +1,99 @@
+package com.ruoyi.branch.service.impl;
+
+import java.util.List;
+
+import com.ruoyi.common.annotation.DataScope;
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.branch.mapper.TBranchTemplateMapper;
+import com.ruoyi.branch.domain.TBranchTemplate;
+import com.ruoyi.branch.service.ITBranchTemplateService;
+
+/**
+ * 常用模板Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2023-08-21
+ */
+@Service
+public class TBranchTemplateServiceImpl implements ITBranchTemplateService 
+{
+    @Autowired
+    private TBranchTemplateMapper tBranchTemplateMapper;
+
+    /**
+     * 查询常用模板
+     * 
+     * @param templateId 常用模板主键
+     * @return 常用模板
+     */
+    @Override
+    public TBranchTemplate selectTBranchTemplateByTemplateId(Long templateId)
+    {
+        return tBranchTemplateMapper.selectTBranchTemplateByTemplateId(templateId);
+    }
+
+    /**
+     * 查询常用模板列表
+     * 
+     * @param tBranchTemplate 常用模板
+     * @return 常用模板
+     */
+    @Override
+    @DataScope(deptAlias = "d", userAlias = "u")
+    public List<TBranchTemplate> selectTBranchTemplateList(TBranchTemplate tBranchTemplate)
+    {
+        return tBranchTemplateMapper.selectTBranchTemplateList(tBranchTemplate);
+    }
+
+    /**
+     * 新增常用模板
+     * 
+     * @param tBranchTemplate 常用模板
+     * @return 结果
+     */
+    @Override
+    public int insertTBranchTemplate(TBranchTemplate tBranchTemplate)
+    {
+        tBranchTemplate.setCreateTime(DateUtils.getNowDate());
+        return tBranchTemplateMapper.insertTBranchTemplate(tBranchTemplate);
+    }
+
+    /**
+     * 修改常用模板
+     * 
+     * @param tBranchTemplate 常用模板
+     * @return 结果
+     */
+    @Override
+    public int updateTBranchTemplate(TBranchTemplate tBranchTemplate)
+    {
+        tBranchTemplate.setUpdateTime(DateUtils.getNowDate());
+        return tBranchTemplateMapper.updateTBranchTemplate(tBranchTemplate);
+    }
+
+    /**
+     * 批量删除常用模板
+     * 
+     * @param templateIds 需要删除的常用模板主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTBranchTemplateByTemplateIds(Long[] templateIds)
+    {
+        return tBranchTemplateMapper.deleteTBranchTemplateByTemplateIds(templateIds);
+    }
+
+    /**
+     * 删除常用模板信息
+     * 
+     * @param templateId 常用模板主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTBranchTemplateByTemplateId(Long templateId)
+    {
+        return tBranchTemplateMapper.deleteTBranchTemplateByTemplateId(templateId);
+    }
+}

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

@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.branch.mapper.TBranchTemplateMapper">
+    
+    <resultMap type="TBranchTemplate" id="TBranchTemplateResult">
+        <result property="templateId"    column="template_id"    />
+        <result property="templateName"    column="template_name"    />
+        <result property="deptId"    column="dept_id"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <sql id="selectTBranchTemplateVo">
+        select u.template_id, u.template_name, u.dept_id, u.del_flag, u.create_by, u.create_time, u.update_by, u.update_time from t_branch_template u left join sys_dept d on u.dept_id = d.dept_id
+    </sql>
+
+    <select id="selectTBranchTemplateList" parameterType="TBranchTemplate" resultMap="TBranchTemplateResult">
+        <include refid="selectTBranchTemplateVo"/>
+        <where>  
+            <if test="templateId != null "> and u.template_id = #{templateId}</if>
+            <if test="templateName != null  and templateName != ''"> and u.template_name like concat(concat('%', #{templateName}), '%')</if>
+            <if test="deptId != null "> and u.dept_id = #{deptId}</if>
+            and u.del_flag = 0
+        </where>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+    </select>
+    
+    <select id="selectTBranchTemplateByTemplateId" parameterType="Long" resultMap="TBranchTemplateResult">
+        <include refid="selectTBranchTemplateVo"/>
+        where u.template_id = #{templateId}
+        and u.del_flag = 0
+    </select>
+        
+    <insert id="insertTBranchTemplate" parameterType="TBranchTemplate">
+        <selectKey keyProperty="templateId" resultType="long" order="BEFORE">
+            SELECT seq_t_branch_template.NEXTVAL as templateId FROM DUAL
+        </selectKey>
+        insert into t_branch_template
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="templateId != null">template_id,</if>
+            <if test="templateName != null and templateName != ''">template_name,</if>
+            <if test="deptId != null">dept_id,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="templateId != null">#{templateId},</if>
+            <if test="templateName != null and templateName != ''">#{templateName},</if>
+            <if test="deptId != null">#{deptId},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTBranchTemplate" parameterType="TBranchTemplate">
+        update t_branch_template
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="templateName != null and templateName != ''">template_name = #{templateName},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where template_id = #{templateId}
+    </update>
+
+    <update id="deleteTBranchTemplateByTemplateId" parameterType="Long">
+        update t_branch_template set del_flag = 2 where template_id = #{templateId}
+    </update>
+
+    <update id="deleteTBranchTemplateByTemplateIds" parameterType="String">
+        update t_branch_template set del_flag = 2 where template_id in
+        <foreach item="templateId" collection="array" open="(" separator="," close=")">
+            #{templateId}
+        </foreach>
+    </update>
+</mapper>

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

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询常用模板列表（不分页）
+export function listTemplateNoPage(query) {
+  return request({
+    url: '/branch/template/listNoPage',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询常用模板列表
+export function listTemplate(query) {
+  return request({
+    url: '/branch/template/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询常用模板详细
+export function getTemplate(templateId) {
+  return request({
+    url: '/branch/template/' + templateId,
+    method: 'get'
+  })
+}
+
+// 新增常用模板
+export function addTemplate(data) {
+  return request({
+    url: '/branch/template',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改常用模板
+export function updateTemplate(data) {
+  return request({
+    url: '/branch/template',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除常用模板
+export function delTemplate(templateId) {
+  return request({
+    url: '/branch/template/' + templateId,
+    method: 'delete'
+  })
+}

ruoyi-ui/src/api/system/notice.js

@@ -1,5 +1,14 @@
 import request from '@/utils/request'
 
+// 查询公告列表
+export function listNoticeNoPage(query) {
+  return request({
+    url: '/system/notice/listNoPage',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询公告列表
 export function listNotice(query) {
   return request({
@@ -41,4 +50,4 @@ export function delNotice(noticeId) {
     url: '/system/notice/' + noticeId,
     method: 'delete'
   })
-}
+}

ruoyi-ui/src/views/branch/xxyd/template/index.vue

@@ -0,0 +1,546 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" size="small" v-show="showSearch" label-width="68px">
+      <el-form-item label="模板名称" prop="templateName">
+        <el-input
+          v-model="queryParams.templateName"
+          placeholder="请输入模板名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="归属部门" prop="deptId" style="width: 268px;">
+        <treeselect style="width: 200px;" v-model="queryParams.deptId" :options="deptOptions" :show-count="true"
+                    placeholder="请选择归属部门"/>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['branch:template:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['branch:template:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['branch:template:remove']"
+        >删除</el-button>
+      </el-col>
+      <!--<el-col :span="1.5">-->
+        <!--<el-button-->
+          <!--type="info"-->
+          <!--plain-->
+          <!--icon="el-icon-upload2"-->
+          <!--size="mini"-->
+          <!--@click="handleImport"-->
+          <!--v-hasPermi="['branch:template:edit']"-->
+        <!--&gt;导入</el-button>-->
+      <!--</el-col>-->
+      <!--<el-col :span="1.5">-->
+        <!--<el-button-->
+          <!--type="warning"-->
+          <!--plain-->
+          <!--icon="el-icon-download"-->
+          <!--size="mini"-->
+          <!--@click="handleExport"-->
+          <!--v-hasPermi="['branch:template:export']"-->
+        <!--&gt;导出</el-button>-->
+      <!--</el-col>-->
+	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="templateList" @selection-change="handleSelectionChange" :height="clientHeight" border>
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="模板名称" align="center" prop="templateName" />
+      <el-table-column label="附件" align="center" prop="filesId" width="100">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-folder"
+            @click="openFileDialog(scope.row)"
+          >查看附件
+          </el-button>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['branch:template:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['branch:template:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改常用模板对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="模板名称" prop="templateName">
+          <el-input v-model="form.templateName" placeholder="请输入模板名称" />
+        </el-form-item>
+          <el-form-item label="归属部门" prop="deptId">
+              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
+          </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+    <!-- 用户导入对话框 -->
+    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+        <el-upload
+                ref="upload"
+                :limit="1"
+                accept=".xlsx, .xls"
+                :headers="upload.headers"
+                :action="upload.url + '?updateSupport=' + upload.updateSupport"
+                :disabled="upload.isUploading"
+                :on-progress="handleFileUploadProgress"
+                :on-success="handleFileSuccess"
+                :auto-upload="false"
+                drag
+        >
+            <i class="el-icon-upload"></i>
+            <div class="el-upload__text">
+                将文件拖到此处，或
+                <em>点击上传</em>
+            </div>
+            <div class="el-upload__tip" slot="tip">
+                <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
+                <el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link>
+            </div>
+            <div class="el-upload__tip" style="color:red" slot="tip">提示：仅允许导入“xls”或“xlsx”格式文件！</div>
+        </el-upload>
+        <div slot="footer" class="dialog-footer">
+            <el-button type="primary" @click="submitFileForm">确 定</el-button>
+            <el-button @click="upload.open = false">取 消</el-button>
+        </div>
+    </el-dialog>
+    <!-- 附件对话框 -->
+    <el-dialog title="附件详情" :visible.sync="file.open" width="60%" append-to-body>
+      <el-row :gutter="10" class="mb8">
+        <el-col :span="1.5">
+          <el-upload
+            ref="doc"
+            :headers="doc.headers"
+            :action="doc.url+'?tableName=branchTemplate&tableId=' + doc.tableId"
+            :disabled="doc.isUploading"
+            :on-progress="handleFileDocProgress"
+            :on-success="handleFileDocSuccess"
+            :auto-upload="true"
+            :file-list="file.fileList"
+          >
+            <el-button type="primary"><i class="el-icon-upload"></i> 点击上传</el-button>
+          </el-upload>
+        </el-col>
+      </el-row>
+      <el-table :data="file.dataList">
+        <el-table-column label="附件名称" align="center">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-document"
+              @click="handleSee(scope.row.url)">
+              {{ scope.row.name }}
+            </el-button>
+          </template>
+        </el-table-column>
+        <el-table-column label="上传人" align="center" prop="creater"/>
+        <el-table-column label="上传时间" align="center" prop="createdate">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.createdate, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-delete"
+              @click="handleDeleteFile(scope.row.id)"
+            >删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listTemplate, getTemplate, delTemplate, addTemplate, updateTemplate, exportTemplate, importTemplate} from "@/api/branch/template";
+import { treeselect } from "@/api/system/dept";
+import { getToken } from "@/utils/auth";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import {delFile, listFile} from "../../../../api/branch/file";
+
+export default {
+  name: "Template",
+  components: { Treeselect },
+  data() {
+    return {
+      file: {
+        id: null,
+        open: false,
+        fileList: [],
+        dataList: [],
+      },
+      doc: {
+        file: "",
+        // 是否显示弹出层（报告附件）
+        open: false,
+        // 弹出层标题（报告附件）
+        title: "",
+        // 是否禁用上传
+        isUploading: false,
+        // 设置上传的请求头部
+        headers: {Authorization: "Bearer " + getToken()},
+        tableId: 0,
+        // 上传的地址
+        url: process.env.VUE_APP_BASE_API + "/branch/file/uploadFile",
+      },
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: false,
+      // 总条数
+      total: 0,
+      // 常用模板表格数据
+      templateList: [],
+      // 弹出层标题
+      title: "",
+      // 部门树选项
+      deptOptions: undefined,
+      clientHeight:300,
+      // 是否显示弹出层
+      open: false,
+        // 用户导入参数
+        upload: {
+            // 是否显示弹出层（用户导入）
+            open: false,
+            // 弹出层标题（用户导入）
+            title: "",
+            // 是否禁用上传
+            isUploading: false,
+            // 是否更新已经存在的用户数据
+            updateSupport: 0,
+            // 设置上传的请求头部
+            headers: { Authorization: "Bearer " + getToken() },
+            // 上传的地址
+            url: process.env.VUE_APP_BASE_API + "/branch/template/importData"
+        },
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        templateId: null,
+        templateName: null,
+        deptId: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        templateId: [
+          { required: true, message: "主键id不能为空", trigger: "blur" }
+        ],
+        templateName: [
+          { required: true, message: "模板名称不能为空", trigger: "blur" }
+        ],
+        deptId: [
+          { required: true, message: "部门id不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  watch: {
+        // 根据名称筛选部门树
+        deptName(val) {
+            this.$refs.tree.filter(val);
+        }
+   },
+  created() {
+      //设置表格高度对应屏幕高度
+      this.$nextTick(() => {
+          this.clientHeight = document.body.clientHeight -250
+      })
+    this.getList();
+    this.getTreeselect();
+  },
+  methods: {
+    //附件上传中处理
+    handleFileDocProgress(event, file, fileList) {
+      this.doc.file = file;
+    },
+    //附件上传成功处理
+    handleFileDocSuccess(response, file, fileList) {
+      console.log(response.data, '-----', this.file.id);
+      this.$modal.msgSuccess("上传成功");
+      this.getFileList();
+    },
+    handleSee(url) {
+      window.open(process.env.VUE_APP_BASE_API + url);
+    },
+    openFileDialog(row) {
+      console.log(row)
+      this.file.open = true;
+      this.doc.tableId = row.templateId;
+      this.getFileList();
+    },
+    getFileList() {
+      listFile({tableId: this.doc.tableId, tableName: 'branchTemplate'}).then(res => {
+        this.file.dataList = res.data
+      })
+    },
+    handleDeleteFile(id) {
+      this.$confirm('是否确认删除?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        return delFile(id);
+      }).then(() => {
+        this.getFileList();
+        this.msgSuccess("删除成功");
+      })
+    },
+    /** 查询常用模板列表 */
+    getList() {
+      this.loading = true;
+      listTemplate(this.queryParams).then(response => {
+        this.templateList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+     /** 查询部门下拉树结构 */
+     getTreeselect() {
+          treeselect().then(response => {
+              this.deptOptions = response.data;
+          });
+     },
+    // 主键id字典翻译
+    templateIdFormat(row, column) {
+      return this.selectDictLabel(this.templateIdOptions, row.templateId);
+    },
+    // 模板名称字典翻译
+    templateNameFormat(row, column) {
+      return this.selectDictLabel(this.templateNameOptions, row.templateName);
+    },
+    // 部门id字典翻译
+    deptIdFormat(row, column) {
+      return this.selectDictLabel(this.deptIdOptions, row.deptId);
+    },
+    // 删除标志字典翻译
+    delFlagFormat(row, column) {
+      return this.selectDictLabel(this.delFlagOptions, row.delFlag);
+    },
+    // 创建者字典翻译
+    createByFormat(row, column) {
+      return this.selectDictLabel(this.createByOptions, row.createBy);
+    },
+    // 创建时间字典翻译
+    createTimeFormat(row, column) {
+      return this.selectDictLabel(this.createTimeOptions, row.createTime);
+    },
+    // 更新者字典翻译
+    updateByFormat(row, column) {
+      return this.selectDictLabel(this.updateByOptions, row.updateBy);
+    },
+    // 更新时间字典翻译
+    updateTimeFormat(row, column) {
+      return this.selectDictLabel(this.updateTimeOptions, row.updateTime);
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        templateId: null,
+        templateName: null,
+        deptId: null,
+        delFlag: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.templateId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加常用模板";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const templateId = row.templateId || this.ids
+      getTemplate(templateId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改常用模板";
+      });
+    },
+      /** 提交按钮 */
+      submitForm() {
+          this.$refs["form"].validate(valid => {
+              if (valid) {
+                  if (this.form.templateId != null) {
+                      updateTemplate(this.form).then(response => {
+                          this.$modal.msgSuccess("修改成功");
+                          this.open = false;
+                          this.getList();
+                      });
+                  } else {
+                      addTemplate(this.form).then(response => {
+                          this.$modal.msgSuccess("新增成功");
+                          this.open = false;
+                          this.getList();
+                      });
+                  }
+              }
+          });
+      },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const templateIds = row.templateId || this.ids;
+      this.$confirm('是否确认删除?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delTemplate(templateIds);
+        }).then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有常用模板数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return exportTemplate(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+        })
+    },
+      /** 导入按钮操作 */
+      handleImport() {
+          this.upload.title = "用户导入";
+          this.upload.open = true;
+      },
+      /** 下载模板操作 */
+      importTemplate() {
+          importTemplate().then(response => {
+              this.download(response.msg);
+          });
+      },
+      // 文件上传中处理
+      handleFileUploadProgress(event, file, fileList) {
+          this.upload.isUploading = true;
+      },
+      // 文件上传成功处理
+      handleFileSuccess(response, file, fileList) {
+          this.upload.open = false;
+          this.upload.isUploading = false;
+          this.$refs.upload.clearFiles();
+          this.$alert(response.msg, "导入结果", { dangerouslyUseHTMLString: true });
+          this.getList();
+      },
+      // 提交上传文件
+      submitFileForm() {
+          this.$refs.upload.submit();
+      }
+  }
+};
+</script>
+
+<style>
+    /** 文本换行符处理 */
+    .el-table .cell{
+        white-space: pre-wrap;
+    }
+    /** textarea字体 */
+    textarea {
+        font-family: "Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB","Microsoft YaHei","微软雅黑",Arial,sans-serif;
+    }
+</style>

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

@@ -12,7 +12,7 @@
 </template>
 
 <script>
-  import { listNotice } from "@/api/system/notice";
+  import { listNoticeNoPage } from "@/api/system/notice";
 
   const totalDuration = 2000;
 
@@ -37,13 +37,13 @@
       }
     },
     created() {
-      this.listNotice();
+      this.listNoticeNoPage();
     },
     methods: {
       /** 查询公示公告列表 */
-      listNotice() {
+      listNoticeNoPage() {
         this.queryParams.isPinned = 1;
-        listNotice(this.queryParams).then(response => {
+        listNoticeNoPage(this.queryParams).then(response => {
           this.noticeList = response.data;
           //判断是否需要滚动
           if (this.noticeList.length > 4) {

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

@@ -0,0 +1,164 @@
+<template>
+  <div>
+    <div class="text-container" :style="{height:height,width:width}">
+      <ul class="allTemplate">
+        <li v-for="(item,index) in templateList" class="info">
+          <span id="template-title" @click="handleSee(item.url)">{{item.name}}</span>
+        </li>
+      </ul>
+    </div>
+  </div>
+</template>
+
+<script>
+  import { listTemplateNoPage } from "@/api/branch/template";
+
+  const totalDuration = 2000;
+
+  export default {
+    name: "TemplateChart",
+    props: {
+      width: {
+        type: String,
+        default: '100%'
+      },
+      height: {
+        type: String,
+        default: '210px'
+      }
+    },
+    data() {
+      return {
+        // 查询参数
+        queryParams: {},
+        // 常用模板列表
+        templateList: null,
+      }
+    },
+    created() {
+      this.listTemplateNoPage();
+    },
+    methods: {
+      handleSee(url) {
+        window.open(process.env.VUE_APP_BASE_API + url);
+      },
+      /** 查询常用模板列表 */
+      listTemplateNoPage() {
+        this.queryParams.isPinned = 1;
+        listTemplateNoPage(this.queryParams).then(response => {
+          this.templateList = response.data;
+          //判断是否需要滚动
+          if (this.templateList.length > 4) {
+            //设置文字滚动一轮时间
+            let elem = document.querySelector('.allTemplate');
+            let state = elem.style['animation'];
+            let time = this.templateList.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.templateList.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>
+  #template-title {
+    padding-left: 20px;
+  }
+
+  #template-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;
+  }
+
+  .allTemplate {
+    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/index.vue

@@ -29,7 +29,7 @@
             <img src="../assets/logo/logo.png" alt="logo" />
           </div>常用下载
         </div>
-        <!--<demeanor-chart />-->
+        <template-chart />
       </el-col>
     </el-row>
     <el-row :gutter="20">
@@ -69,11 +69,12 @@ import BrithChart from "./dashboard/BrithChart";
 import DemeanorChart from "./dashboard/DemeanorChart";
 import NoticeChart from "./dashboard/NoticeChart";
 import ManageChart from "./dashboard/ManageChart";
+import TemplateChart from "./dashboard/TemplateChart";
 import { listPublicizeProfiles } from "@/api/branch/publicize";
 
 export default {
   name: "Index",
-  components: { BrithChart, NoticeChart, DemeanorChart, ManageChart },
+  components: { BrithChart, NoticeChart, DemeanorChart, ManageChart, TemplateChart },
   data() {
     return {
       // 支部园地宣传图片