-附件

-学习资料管理

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

@@ -0,0 +1,125 @@
+package com.ruoyi.web.controller.branch;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.branch.domain.TBranchStudy;
+import com.ruoyi.branch.service.ITFileService;
+import com.ruoyi.common.utils.StringUtils;
+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.TBranchManage;
+import com.ruoyi.branch.service.ITBranchManageService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 支部党课学习资料管理Controller
+ *
+ * @author ruoyi
+ * @date 2023-07-14
+ */
+@RestController
+@RequestMapping("/branch/manage")
+public class TBranchManageController extends BaseController {
+    @Autowired
+    private ITBranchManageService tBranchManageService;
+    @Autowired
+    private ITFileService tFileService;
+
+    /**
+     * 查询支部党课学习资料管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('branch:manage:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TBranchManage tBranchManage) {
+        startPage();
+        List<TBranchManage> list = tBranchManageService.selectTBranchManageList(tBranchManage);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出支部党课学习资料管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('branch:manage:export')")
+    @Log(title = "支部党课学习资料管理", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, TBranchManage tBranchManage) {
+        List<TBranchManage> list = tBranchManageService.selectTBranchManageList(tBranchManage);
+        ExcelUtil<TBranchManage> util = new ExcelUtil<TBranchManage>(TBranchManage.class);
+        util.exportExcel(response, list, "支部党课学习资料管理数据");
+    }
+
+    /**
+     * 获取支部党课学习资料管理详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('branch:manage:query')")
+    @GetMapping(value = "/{manageId}")
+    public AjaxResult getInfo(@PathVariable("manageId") Long manageId) {
+        return success(tBranchManageService.selectTBranchManageByManageId(manageId));
+    }
+
+    /**
+     * 新增支部党课学习资料管理
+     */
+    @PreAuthorize("@ss.hasPermi('branch:manage:add')")
+    @Log(title = "支部党课学习资料管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TBranchManage tBranchManage) {
+        return toAjax(tBranchManageService.insertTBranchManage(tBranchManage));
+    }
+
+    /**
+     * 修改支部党课学习资料管理
+     */
+    @PreAuthorize("@ss.hasPermi('branch:manage:edit')")
+    @Log(title = "支部党课学习资料管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TBranchManage tBranchManage) {
+        if (StringUtils.isNotEmpty(tBranchManage.getFilesId())) {
+            TBranchManage manage = tBranchManageService.selectTBranchManageByManageId(tBranchManage.getManageId());
+            if (StringUtils.isNotEmpty(manage.getFilesId())) {
+                tBranchManage.setFilesId(manage.getFilesId() + "," + tBranchManage.getFilesId());
+            }
+        }
+        return toAjax(tBranchManageService.updateTBranchManage(tBranchManage));
+    }
+
+    /**
+     * 删除支部党课学习资料管理
+     */
+    @PreAuthorize("@ss.hasPermi('branch:manage:remove')")
+    @Log(title = "支部党课学习资料管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{manageIds}")
+    public AjaxResult remove(@PathVariable Long[] manageIds) {
+        return toAjax(tBranchManageService.deleteTBranchManageByManageIds(manageIds));
+    }
+
+    @PreAuthorize("@ss.hasPermi('branch:manage:remove')")
+    @Log(title = "支部党课学习资料管理删除附件", businessType = BusinessType.DELETE)
+    @PutMapping("/delFile")
+    public AjaxResult removeFile(@RequestBody TBranchManage tBranchManage) {
+        TBranchManage mange = tBranchManageService.selectTBranchManageByManageId(tBranchManage.getManageId());
+        mange.setFilesId(mange.getFilesId().replace(tBranchManage.getFilesId(), ""));
+        if (mange.getFilesId().contains(",,")){
+            mange.setFilesId(mange.getFilesId().replace(",,", ","));
+        }
+        if (mange.getFilesId().endsWith(",")) {
+            mange.setFilesId(mange.getFilesId().substring(0, mange.getFilesId().length()-1));
+        }
+        tBranchManageService.updateTBranchManage(mange);
+        return toAjax(tFileService.deleteTFileById(Long.valueOf(tBranchManage.getFilesId())));
+    }
+}

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

@@ -3,6 +3,7 @@ package com.ruoyi.web.controller.branch;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.ruoyi.branch.service.ITFileService;
 import com.ruoyi.common.utils.StringUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -34,6 +35,8 @@ import com.ruoyi.common.core.page.TableDataInfo;
 public class TBranchStudyController extends BaseController {
     @Autowired
     private ITBranchStudyService tBranchStudyService;
+    @Autowired
+    private ITFileService tFileService;
 
     /**
      * 查询支部党课学习列表
@@ -102,4 +105,20 @@ public class TBranchStudyController extends BaseController {
     public AjaxResult remove(@PathVariable Long[] studyIds) {
         return toAjax(tBranchStudyService.deleteTBranchStudyByStudyIds(studyIds));
     }
+
+    @PreAuthorize("@ss.hasPermi('branch:study:remove')")
+    @Log(title = "支部党课删除附件", businessType = BusinessType.DELETE)
+    @PutMapping("/delFile")
+    public AjaxResult removeFile(@RequestBody TBranchStudy tBranchStudy) {
+        TBranchStudy study = tBranchStudyService.selectTBranchStudyByStudyId(tBranchStudy.getStudyId());
+        study.setFilesId(study.getFilesId().replace(tBranchStudy.getFilesId(), ""));
+        if (study.getFilesId().contains(",,")){
+            study.setFilesId(study.getFilesId().replace(",,", ","));
+        }
+        if (study.getFilesId().endsWith(",")) {
+            study.setFilesId(study.getFilesId().substring(0, study.getFilesId().length()-1));
+        }
+        tBranchStudyService.updateTBranchStudy(study);
+        return toAjax(tFileService.deleteTFileById(Long.valueOf(tBranchStudy.getFilesId())));
+    }
 }

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

@@ -1,4 +1,4 @@
-package com.ruoyi.branch.controller;
+package com.ruoyi.web.controller.branch;
 
 import java.io.IOException;
 import java.util.Date;
@@ -28,18 +28,15 @@ import org.springframework.web.multipart.MultipartFile;
  */
 @RestController
 @RequestMapping("/branch/file")
-public class TFileController extends BaseController
-{
+public class TFileController extends BaseController {
     @Autowired
     private ITFileService tFileService;
 
     /**
      * 查询附件列表
      */
-    @PreAuthorize("@ss.hasPermi('branch:file:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TFile tFile)
-    {
+    public TableDataInfo list(TFile tFile) {
         startPage();
         List<TFile> list = tFileService.selectTFileList(tFile);
         return getDataTable(list);
@@ -48,11 +45,9 @@ public class TFileController extends BaseController
     /**
      * 导出附件列表
      */
-    @PreAuthorize("@ss.hasPermi('branch:file:export')")
     @Log(title = "附件", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, TFile tFile)
-    {
+    public void export(HttpServletResponse response, TFile tFile) {
         List<TFile> list = tFileService.selectTFileList(tFile);
         ExcelUtil<TFile> util = new ExcelUtil<TFile>(TFile.class);
         util.exportExcel(response, list, "附件数据");
@@ -61,43 +56,36 @@ public class TFileController extends BaseController
     /**
      * 获取附件详细信息
      */
-    @PreAuthorize("@ss.hasPermi('branch:file:query')")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
         return success(tFileService.selectTFileById(id));
     }
 
     /**
      * 新增附件
      */
-    @PreAuthorize("@ss.hasPermi('branch:file:add')")
+
     @Log(title = "附件", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody TFile tFile)
-    {
+    public AjaxResult add(@RequestBody TFile tFile) {
         return toAjax(tFileService.insertTFile(tFile));
     }
 
     /**
      * 修改附件
      */
-    @PreAuthorize("@ss.hasPermi('branch:file:edit')")
     @Log(title = "附件", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody TFile tFile)
-    {
+    public AjaxResult edit(@RequestBody TFile tFile) {
         return toAjax(tFileService.updateTFile(tFile));
     }
 
     /**
      * 删除附件
      */
-    @PreAuthorize("@ss.hasPermi('branch:file:remove')")
     @Log(title = "附件", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(tFileService.deleteTFileByIds(ids));
     }
 
@@ -107,7 +95,7 @@ public class TFileController extends BaseController
         if (!file.isEmpty()) {
             String avatar = FileUploadUtils.upload(RuoYiConfig.getUploadPath(), file);
             TFile tFile = new TFile();
-            tFile.setName(file.getName());
+            tFile.setName(file.getOriginalFilename());
             tFile.setUrl(avatar);
             tFile.setCreatedate(new Date());
             tFile.setCreaterCode(getUserId().toString());

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

@@ -0,0 +1,147 @@
+package com.ruoyi.branch.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+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_manage
+ *
+ * @author ruoyi
+ * @date 2023-07-14
+ */
+public class TBranchManage extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键id */
+    private Long manageId;
+
+    /** 月度 */
+    @Excel(name = "月度", width = 30, dateFormat = "yyyy-MM")
+    private String monthly;
+
+    /** 年份 */
+    private String year;
+
+    /** 课件描述 */
+    @Excel(name = "课件描述")
+    private String describe;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remarks;
+
+    /** 删除标志（0代表存在 2代表删除） */
+    private String delFlag;
+
+    /** 部门id */
+    @Excel(name = "部门id")
+    private Long deptId;
+
+    /** 附件id */
+    @Excel(name = "附件id")
+    private String filesId;
+
+    public void setManageId(Long manageId)
+    {
+        this.manageId = manageId;
+    }
+
+    public Long getManageId()
+    {
+        return manageId;
+    }
+
+    public void setMonthly(String monthly)
+    {
+        this.monthly = monthly;
+    }
+
+    public String getMonthly()
+    {
+        return monthly;
+    }
+
+    public void setYear(String year)
+    {
+        this.year = year;
+    }
+
+    public String getYear()
+    {
+        return year;
+    }
+
+    public void setDescribe(String describe)
+    {
+        this.describe = describe;
+    }
+
+    public String getDescribe()
+    {
+        return describe;
+    }
+
+    public void setRemarks(String remarks)
+    {
+        this.remarks = remarks;
+    }
+
+    public String getRemarks()
+    {
+        return remarks;
+    }
+
+    public void setDelFlag(String delFlag)
+    {
+        this.delFlag = delFlag;
+    }
+
+    public String getDelFlag()
+    {
+        return delFlag;
+    }
+
+    public void setDeptId(Long deptId)
+    {
+        this.deptId = deptId;
+    }
+
+    public Long getDeptId()
+    {
+        return deptId;
+    }
+
+    public void setFilesId(String filesId)
+    {
+        this.filesId = filesId;
+    }
+
+    public String getFilesId()
+    {
+        return filesId;
+    }
+
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("manageId", getManageId())
+            .append("monthly", getMonthly())
+            .append("year", getYear())
+            .append("describe", getDescribe())
+            .append("remarks", getRemarks())
+            .append("delFlag", getDelFlag())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("deptId", getDeptId())
+            .append("filesId", getFilesId())
+            .toString();
+    }
+}

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

@@ -1,6 +1,7 @@
 package com.ruoyi.branch.domain;
 
 import java.util.Date;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -9,7 +10,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 附件对象 t_file
- * 
+ *
  * @author ruoyi
  * @date 2023-07-13
  */
@@ -40,9 +41,11 @@ public class TFile extends BaseEntity
     private Long delFlag;
 
     /** 创建人 */
-    @Excel(name = "创建人")
     private String createrCode;
 
+    @Excel(name = "创建人")
+    private String creater;
+
     /** 创建时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
@@ -61,112 +64,130 @@ public class TFile extends BaseEntity
     @Excel(name = "部门编号")
     private Long deptId;
 
-    public void setId(Long id) 
+    private Long[] filesId;
+
+    public String getCreater() {
+        return creater;
+    }
+
+    public void setCreater(String creater) {
+        this.creater = creater;
+    }
+
+    public Long[] getFilesId() {
+        return filesId;
+    }
+
+    public void setFilesId(Long[] filesId) {
+        this.filesId = filesId;
+    }
+
+    public void setId(Long id)
     {
         this.id = id;
     }
 
-    public Long getId() 
+    public Long getId()
     {
         return id;
     }
 
-    public void setUrl(String url) 
+    public void setUrl(String url)
     {
         this.url = url;
     }
 
-    public String getUrl() 
+    public String getUrl()
     {
         return url;
     }
 
-    public void setName(String name) 
+    public void setName(String name)
     {
         this.name = name;
     }
 
-    public String getName() 
+    public String getName()
     {
         return name;
     }
 
-    public void setRemarks(String remarks) 
+    public void setRemarks(String remarks)
     {
         this.remarks = remarks;
     }
 
-    public String getRemarks() 
+    public String getRemarks()
     {
         return remarks;
     }
 
-    public void setStatus(Long status) 
+    public void setStatus(Long status)
     {
         this.status = status;
     }
 
-    public Long getStatus() 
+    public Long getStatus()
     {
         return status;
     }
 
-    public void setDelFlag(Long delFlag) 
+    public void setDelFlag(Long delFlag)
     {
         this.delFlag = delFlag;
     }
 
-    public Long getDelFlag() 
+    public Long getDelFlag()
     {
         return delFlag;
     }
 
-    public void setCreaterCode(String createrCode) 
+    public void setCreaterCode(String createrCode)
     {
         this.createrCode = createrCode;
     }
 
-    public String getCreaterCode() 
+    public String getCreaterCode()
     {
         return createrCode;
     }
 
-    public void setCreatedate(Date createdate) 
+    public void setCreatedate(Date createdate)
     {
         this.createdate = createdate;
     }
 
-    public Date getCreatedate() 
+    public Date getCreatedate()
     {
         return createdate;
     }
 
-    public void setUpdaterCode(Long updaterCode) 
+    public void setUpdaterCode(Long updaterCode)
     {
         this.updaterCode = updaterCode;
     }
 
-    public Long getUpdaterCode() 
+    public Long getUpdaterCode()
     {
         return updaterCode;
     }
 
-    public void setUpdatedate(Date updatedate) 
+    public void setUpdatedate(Date updatedate)
     {
         this.updatedate = updatedate;
     }
 
-    public Date getUpdatedate() 
+    public Date getUpdatedate()
     {
         return updatedate;
     }
 
-    public void setDeptId(Long deptId) 
+    public void setDeptId(Long deptId)
     {
         this.deptId = deptId;
     }
 
-    public Long getDeptId() 
+    public Long getDeptId()
     {
         return deptId;
     }

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

@@ -0,0 +1,61 @@
+package com.ruoyi.branch.mapper;
+
+import java.util.List;
+import com.ruoyi.branch.domain.TBranchManage;
+
+/**
+ * 支部党课学习资料管理Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2023-07-14
+ */
+public interface TBranchManageMapper 
+{
+    /**
+     * 查询支部党课学习资料管理
+     * 
+     * @param manageId 支部党课学习资料管理主键
+     * @return 支部党课学习资料管理
+     */
+    public TBranchManage selectTBranchManageByManageId(Long manageId);
+
+    /**
+     * 查询支部党课学习资料管理列表
+     * 
+     * @param tBranchManage 支部党课学习资料管理
+     * @return 支部党课学习资料管理集合
+     */
+    public List<TBranchManage> selectTBranchManageList(TBranchManage tBranchManage);
+
+    /**
+     * 新增支部党课学习资料管理
+     * 
+     * @param tBranchManage 支部党课学习资料管理
+     * @return 结果
+     */
+    public int insertTBranchManage(TBranchManage tBranchManage);
+
+    /**
+     * 修改支部党课学习资料管理
+     * 
+     * @param tBranchManage 支部党课学习资料管理
+     * @return 结果
+     */
+    public int updateTBranchManage(TBranchManage tBranchManage);
+
+    /**
+     * 删除支部党课学习资料管理
+     * 
+     * @param manageId 支部党课学习资料管理主键
+     * @return 结果
+     */
+    public int deleteTBranchManageByManageId(Long manageId);
+
+    /**
+     * 批量删除支部党课学习资料管理
+     * 
+     * @param manageIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteTBranchManageByManageIds(Long[] manageIds);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.branch.service;
+
+import java.util.List;
+import com.ruoyi.branch.domain.TBranchManage;
+
+/**
+ * 支部党课学习资料管理Service接口
+ * 
+ * @author ruoyi
+ * @date 2023-07-14
+ */
+public interface ITBranchManageService 
+{
+    /**
+     * 查询支部党课学习资料管理
+     * 
+     * @param manageId 支部党课学习资料管理主键
+     * @return 支部党课学习资料管理
+     */
+    public TBranchManage selectTBranchManageByManageId(Long manageId);
+
+    /**
+     * 查询支部党课学习资料管理列表
+     * 
+     * @param tBranchManage 支部党课学习资料管理
+     * @return 支部党课学习资料管理集合
+     */
+    public List<TBranchManage> selectTBranchManageList(TBranchManage tBranchManage);
+
+    /**
+     * 新增支部党课学习资料管理
+     * 
+     * @param tBranchManage 支部党课学习资料管理
+     * @return 结果
+     */
+    public int insertTBranchManage(TBranchManage tBranchManage);
+
+    /**
+     * 修改支部党课学习资料管理
+     * 
+     * @param tBranchManage 支部党课学习资料管理
+     * @return 结果
+     */
+    public int updateTBranchManage(TBranchManage tBranchManage);
+
+    /**
+     * 批量删除支部党课学习资料管理
+     * 
+     * @param manageIds 需要删除的支部党课学习资料管理主键集合
+     * @return 结果
+     */
+    public int deleteTBranchManageByManageIds(Long[] manageIds);
+
+    /**
+     * 删除支部党课学习资料管理信息
+     * 
+     * @param manageId 支部党课学习资料管理主键
+     * @return 结果
+     */
+    public int deleteTBranchManageByManageId(Long manageId);
+}

ruoyi-system/src/main/java/com/ruoyi/branch/service/impl/TBranchManageServiceImpl.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.TBranchManageMapper;
+import com.ruoyi.branch.domain.TBranchManage;
+import com.ruoyi.branch.service.ITBranchManageService;
+
+/**
+ * 支部党课学习资料管理Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2023-07-14
+ */
+@Service
+public class TBranchManageServiceImpl implements ITBranchManageService
+{
+    @Autowired
+    private TBranchManageMapper tBranchManageMapper;
+
+    /**
+     * 查询支部党课学习资料管理
+     *
+     * @param manageId 支部党课学习资料管理主键
+     * @return 支部党课学习资料管理
+     */
+    @Override
+    public TBranchManage selectTBranchManageByManageId(Long manageId)
+    {
+        return tBranchManageMapper.selectTBranchManageByManageId(manageId);
+    }
+
+    /**
+     * 查询支部党课学习资料管理列表
+     *
+     * @param tBranchManage 支部党课学习资料管理
+     * @return 支部党课学习资料管理
+     */
+    @Override
+    @DataScope(deptAlias = "d", userAlias = "u")
+    public List<TBranchManage> selectTBranchManageList(TBranchManage tBranchManage)
+    {
+        return tBranchManageMapper.selectTBranchManageList(tBranchManage);
+    }
+
+    /**
+     * 新增支部党课学习资料管理
+     *
+     * @param tBranchManage 支部党课学习资料管理
+     * @return 结果
+     */
+    @Override
+    public int insertTBranchManage(TBranchManage tBranchManage)
+    {
+        tBranchManage.setCreateTime(DateUtils.getNowDate());
+        return tBranchManageMapper.insertTBranchManage(tBranchManage);
+    }
+
+    /**
+     * 修改支部党课学习资料管理
+     *
+     * @param tBranchManage 支部党课学习资料管理
+     * @return 结果
+     */
+    @Override
+    public int updateTBranchManage(TBranchManage tBranchManage)
+    {
+        tBranchManage.setUpdateTime(DateUtils.getNowDate());
+        return tBranchManageMapper.updateTBranchManage(tBranchManage);
+    }
+
+    /**
+     * 批量删除支部党课学习资料管理
+     *
+     * @param manageIds 需要删除的支部党课学习资料管理主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTBranchManageByManageIds(Long[] manageIds)
+    {
+        return tBranchManageMapper.deleteTBranchManageByManageIds(manageIds);
+    }
+
+    /**
+     * 删除支部党课学习资料管理信息
+     *
+     * @param manageId 支部党课学习资料管理主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTBranchManageByManageId(Long manageId)
+    {
+        return tBranchManageMapper.deleteTBranchManageByManageId(manageId);
+    }
+}

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

@@ -0,0 +1,111 @@
+<?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.TBranchManageMapper">
+
+    <resultMap type="TBranchManage" id="TBranchManageResult">
+        <result property="manageId"    column="manage_id"    />
+        <result property="monthly"    column="monthly"    />
+        <result property="year"    column="year"    />
+        <result property="describe"    column="describe"    />
+        <result property="remarks"    column="remarks"    />
+        <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"    />
+        <result property="deptId"    column="dept_id"    />
+        <result property="filesId"    column="files_id"    />
+    </resultMap>
+
+    <sql id="selectTBranchManageVo">
+        select u.manage_id, u.monthly, u.year, u.describe, u.remarks, u.del_flag, u.create_by, u.create_time, u.update_by, u.update_time, u.dept_id, u.files_id from t_branch_manage u left join sys_dept d on u.dept_id = d.dept_id
+    </sql>
+
+    <select id="selectTBranchManageList" parameterType="TBranchManage" resultMap="TBranchManageResult">
+        <include refid="selectTBranchManageVo"/>
+        <where>
+            <if test="manageId != null "> and u.manage_id = #{manageId}</if>
+            <if test="monthly != null "> and u.monthly = #{monthly}</if>
+            <if test="year != null "> and u.year=#{year}</if>
+            <if test="describe != null  and describe != ''"> and u.describe = #{describe}</if>
+            <if test="remarks != null  and remarks != ''"> and u.remarks = #{remarks}</if>
+            <if test="deptId != null "> and u.dept_id = #{deptId}</if>
+            <if test="filesId != null  and filesId != ''"> and u.files_id = #{filesId}</if>
+            and u.del_flag = 0
+        </where>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+    </select>
+
+    <select id="selectTBranchManageByManageId" parameterType="Long" resultMap="TBranchManageResult">
+        <include refid="selectTBranchManageVo"/>
+        where u.manage_id = #{manageId}
+        and u.del_flag = 0
+    </select>
+
+    <insert id="insertTBranchManage" parameterType="TBranchManage">
+        <selectKey keyProperty="manageId" resultType="long" order="BEFORE">
+            SELECT seq_t_branch_manage.NEXTVAL as id FROM DUAL
+        </selectKey>
+        insert into t_branch_manage
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="manageId != null">manage_id,</if>
+            <if test="monthly != null">monthly,</if>
+            <if test="year != null">year,</if>
+            <if test="describe != null">describe,</if>
+            <if test="remarks != null">remarks,</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>
+            <if test="deptId != null">dept_id,</if>
+            <if test="filesId != null">files_id,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="manageId != null">#{manageId},</if>
+            <if test="monthly != null">#{monthly},</if>
+            <if test="year != null">#{year},</if>
+            <if test="describe != null">#{describe},</if>
+            <if test="remarks != null">#{remarks},</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>
+            <if test="deptId != null">#{deptId},</if>
+            <if test="filesId != null">#{filesId},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTBranchManage" parameterType="TBranchManage">
+        update t_branch_manage
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="monthly != null">monthly = #{monthly},</if>
+            <if test="year != null">year = #{year},</if>
+            <if test="describe != null">describe = #{describe},</if>
+            <if test="remarks != null">remarks = #{remarks},</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>
+            <if test="deptId != null">dept_id = #{deptId},</if>
+            <if test="filesId != null">files_id = #{filesId},</if>
+        </trim>
+        where manage_id = #{manageId}
+    </update>
+
+    <update id="deleteTBranchManageByManageId" parameterType="Long">
+        update t_branch_manage set del_flag = 2 where manage_id = #{manageId}
+    </update>
+
+    <update id="deleteTBranchManageByManageIds" parameterType="String">
+        update t_branch_manage set del_flag = 2 where manage_id in
+        <foreach item="manageId" collection="array" open="(" separator="," close=")">
+            #{manageId}
+        </foreach>
+    </update>
+</mapper>

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

@@ -16,6 +16,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updaterCode"    column="updater_code"    />
         <result property="updatedate"    column="updatedate"    />
         <result property="deptId"    column="dept_id"    />
+        <result property="creater"    column="nick_name"    />
     </resultMap>
 
     <sql id="selectTFileVo">
@@ -23,17 +24,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectTFileList" parameterType="TFile" resultMap="TFileResult">
-        <include refid="selectTFileVo"/>
+        select u.id, u.url, u.name, u.remarks, u.status, u.del_flag, u.creater_code, u.createdate, u.updater_code, u.updatedate, u.dept_id,su.nick_name from t_file u left join sys_dept d on u.dept_id = d.dept_id
+        left join sys_user su on u.creater_code=su.user_id
         <where>
-            <if test="url != null  and url != ''"> and u.url = #{url}</if>
-            <if test="name != null  and name != ''"> and u.name like concat('%', #{name}, '%')</if>
-            <if test="remarks != null  and remarks != ''"> and u.remarks = #{remarks}</if>
-            <if test="status != null "> and u.status = #{status}</if>
-            <if test="createrCode != null  and createrCode != ''"> and u.creater_code = #{createrCode}</if>
-            <if test="createdate != null "> and u.createdate = #{createdate}</if>
-            <if test="updaterCode != null "> and u.updater_code = #{updaterCode}</if>
-            <if test="updatedate != null "> and u.updatedate = #{updatedate}</if>
-            <if test="deptId != null "> and u.dept_id = #{deptId}</if>
+            <if test="url != null  and url != ''">and u.url = #{url}</if>
+            <if test="name != null  and name != ''">and u.name like concat('%', #{name}, '%')</if>
+            <if test="remarks != null  and remarks != ''">and u.remarks = #{remarks}</if>
+            <if test="status != null ">and u.status = #{status}</if>
+            <if test="createrCode != null  and createrCode != ''">and u.creater_code = #{createrCode}</if>
+            <if test="createdate != null ">and u.createdate = #{createdate}</if>
+            <if test="updaterCode != null ">and u.updater_code = #{updaterCode}</if>
+            <if test="updatedate != null ">and u.updatedate = #{updatedate}</if>
+            <if test="deptId != null ">and u.dept_id = #{deptId}</if>
+            <if test="filesId != null ">and id in
+                <foreach item="id" collection="filesId" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
             and u.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->
@@ -47,8 +54,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <insert id="insertTFile" parameterType="TFile" useGeneratedKeys="true" keyProperty="id">
+        <selectKey keyProperty="id" resultType="long" order="BEFORE">
+            SELECT seq_t_file.NEXTVAL as id FROM DUAL
+        </selectKey>
         insert into t_file
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
             <if test="url != null">url,</if>
             <if test="name != null">name,</if>
             <if test="remarks != null">remarks,</if>
@@ -61,6 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptId != null">dept_id,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
             <if test="url != null">#{url},</if>
             <if test="name != null">#{name},</if>
             <if test="remarks != null">#{remarks},</if>

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

@@ -0,0 +1,55 @@
+import request from '@/utils/request'
+
+// 查询支部党课学习资料管理列表
+export function listManage(query) {
+  return request({
+    url: '/branch/manage/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询支部党课学习资料管理详细
+export function getManage(manageId) {
+  return request({
+    url: '/branch/manage/' + manageId,
+    method: 'get'
+  })
+}
+
+// 新增支部党课学习资料管理
+export function addManage(data) {
+  return request({
+    url: '/branch/manage',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改支部党课学习资料管理
+export function updateManage(data) {
+  return request({
+    url: '/branch/manage',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除支部党课学习资料管理
+export function delManage(manageId) {
+  return request({
+    url: '/branch/manage/' + manageId,
+    method: 'delete'
+  })
+}
+
+
+// 删除支部党课学习资料管理附件
+export function delManageFile(data) {
+  return request({
+    url: '/branch/manage/delFile',
+    method: 'put',
+    data: data
+  })
+}
+

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

@@ -42,3 +42,13 @@ export function delStudy(studyId) {
     method: 'delete'
   })
 }
+
+
+// 删除支部党课学习
+export function delStudyFile(data) {
+  return request({
+    url: '/branch/study/delFile',
+    method: 'put',
+    data: data
+  })
+}

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

@@ -0,0 +1,551 @@
+<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="year">
+        <el-date-picker size="small" style="width: 200px"
+                        v-model="queryParams.year"
+                        type="year"
+                        value-format="yyyy"
+                        placeholder="选择年份">
+        </el-date-picker>
+      </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:manage: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:manage: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:manage:remove']"
+        >删除
+        </el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="manageList" @selection-change="handleSelectionChange" :height="clientHeight"
+              border>
+      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column label="月度" align="center" prop="monthly" width="100">
+        <template slot-scope="scope">
+          {{ scope.row.monthly }}月
+        </template>
+      </el-table-column>
+      <el-table-column label="课件描述" align="center" prop="describe" min-width="180"/>
+      <el-table-column label="课件附件" align="center" prop="filesId" width="180">
+        <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" prop="remarks" width="150"/>
+      <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:manage:edit']"
+          >修改
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['branch:manage: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="date">
+          <el-date-picker size="small" style="width: 200px"
+                          v-model="form.date"
+                          type="month"
+                          placeholder="选择月度">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="课件描述" prop="describe">
+          <el-input v-model="form.describe" placeholder="请输入课件描述"/>
+        </el-form-item>
+        <el-form-item label="备注" prop="remarks">
+          <el-input v-model="form.remarks" 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="file.doc.headers"
+            :action="file.doc.url"
+            :disabled="file.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="handleFileDelete(scope.row)"
+            >删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  addManage,
+  delManage,
+  exportManage,
+  getManage,
+  importTemplate,
+  listManage,
+  updateManage
+} from "@/api/branch/manage";
+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 {listFile} from "../../../api/branch/file";
+import {delManageFile} from "../../../api/branch/manage";
+
+export default {
+  name: "Manage",
+  components: {Treeselect},
+  data() {
+    return {
+      file: {
+        id: null,
+        open: false,
+        fileList: [],
+        dataList: [],
+        doc: {
+          file: "",
+          // 是否显示弹出层（报告附件）
+          open: false,
+          // 弹出层标题（报告附件）
+          title: "",
+          // 是否禁用上传
+          isUploading: false,
+          // 设置上传的请求头部
+          headers: {Authorization: "Bearer " + getToken()},
+          // 上传的地址
+          url: process.env.VUE_APP_BASE_API + "/branch/file/uploadFile",
+        },
+      },
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 支部党课学习资料管理表格数据
+      manageList: [],
+      // 弹出层标题
+      title: "",
+      // 部门树选项
+      deptOptions: undefined,
+      clientHeight: 300,
+      // 是否显示弹出层
+      open: false,
+      // 主键id字典
+      manageIdOptions: [],
+      // 月度字典
+      monthlyOptions: [],
+      // 年份字典
+      yearOptions: [],
+      // 课件描述字典
+      describeOptions: [],
+      // 备注字典
+      remarksOptions: [],
+      // 删除标志字典
+      delFlagOptions: [],
+      // 创建者字典
+      createByOptions: [],
+      // 创建时间字典
+      createTimeOptions: [],
+      // 更新者字典
+      updateByOptions: [],
+      // 更新时间字典
+      updateTimeOptions: [],
+      // 部门id字典
+      deptIdOptions: [],
+      // 附件id字典
+      filesIdOptions: [],
+      // 用户导入参数
+      upload: {
+        // 是否显示弹出层（用户导入）
+        open: false,
+        // 弹出层标题（用户导入）
+        title: "",
+        // 是否禁用上传
+        isUploading: false,
+        // 是否更新已经存在的用户数据
+        updateSupport: 0,
+        // 设置上传的请求头部
+        headers: {Authorization: "Bearer " + getToken()},
+        // 上传的地址
+        url: process.env.VUE_APP_BASE_API + "/branch/manage/importData"
+      },
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        manageId: null,
+        monthly: null,
+        year: (new Date().getFullYear())+"",
+        describe: null,
+        remarks: null,
+        deptId: null,
+        filesId: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        date: [
+          {required: true, message: "月度不能为空", trigger: "blur"}
+        ],
+      }
+    };
+  },
+  watch: {
+    // 根据名称筛选部门树
+    deptName(val) {
+      this.$refs.tree.filter(val);
+    }
+  },
+  created() {
+    //设置表格高度对应屏幕高度
+    this.$nextTick(() => {
+      this.clientHeight = document.body.clientHeight - 270
+    })
+    this.getList();
+    this.getTreeselect();
+  },
+  methods: {
+    handleSee(url) {
+      window.open(process.env.VUE_APP_BASE_API + url);
+    },
+    handleFileDelete(row) {
+      delManageFile({filesId:row.id,manageId:this.file.id}).then(res=>{
+        this.$modal.msgSuccess("删除成功");
+        this.getFileList(this.file.id);
+      })
+    },
+    //附件上传中处理
+    handleFileDocProgress(event, file, fileList) {
+      this.file.doc.file = file;
+    },
+    //附件上传成功处理
+    handleFileDocSuccess(response, file, fileList) {
+      updateManage({filesId: response.data, manageId: this.file.id}).then(response => {
+        this.$modal.msgSuccess("上传成功");
+        this.getFileList(this.file.id)
+      });
+    },
+    openFileDialog(row) {
+      this.file.open = true;
+      this.file.id = row.manageId;
+      this.getFileList(row.manageId);
+    },
+    getFileList(manageId) {
+      getManage(manageId).then(res => {
+        let filesId = res.data.filesId.split(',');
+        listFile({filesId: filesId}).then(result => {
+          this.file.dataList = result.rows
+        })
+      })
+    },
+    /** 查询支部党课学习资料管理列表 */
+    getList() {
+      this.loading = true;
+      listManage(this.queryParams).then(response => {
+        this.manageList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    /** 查询部门下拉树结构 */
+    getTreeselect() {
+      treeselect().then(response => {
+        this.deptOptions = response.data;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        manageId: null,
+        monthly: null,
+        year: null,
+        describe: null,
+        remarks: null,
+        delFlag: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        deptId: null,
+        filesId: null,
+        date : new Date(),
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.manageId)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加支部党课学习资料管理";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const manageId = row.manageId || this.ids
+      getManage(manageId).then(response => {
+        this.form = response.data;
+        this.form.date=new Date();
+        this.form.date.setMonth(response.data.monthly - 1);
+        this.form.date.setFullYear(response.data.year);
+        console.log(this.date)
+        this.open = true;
+        this.title = "修改支部党课学习资料管理";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.form.year = this.form.date.getFullYear();
+      this.form.monthly = (this.form.date.getMonth() + 1);
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.manageId != null) {
+            updateManage(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addManage(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const manageIds = row.manageId || this.ids;
+      this.$confirm('是否确认删除?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        return delManage(manageIds);
+      }).then(() => {
+        this.getList();
+        this.msgSuccess("删除成功");
+      })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有支部党课学习资料管理数据项?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        return exportManage(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>