支部党课学习

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

@@ -0,0 +1,104 @@
+package com.ruoyi.web.controller.branch;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+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.TBranchStudy;
+import com.ruoyi.branch.service.ITBranchStudyService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 支部党课学习Controller
+ * 
+ * @author ruoyi
+ * @date 2023-06-09
+ */
+@RestController
+@RequestMapping("/branch/study")
+public class TBranchStudyController extends BaseController
+{
+    @Autowired
+    private ITBranchStudyService tBranchStudyService;
+
+    /**
+     * 查询支部党课学习列表
+     */
+    @PreAuthorize("@ss.hasPermi('branch:study:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TBranchStudy tBranchStudy)
+    {
+        startPage();
+        List<TBranchStudy> list = tBranchStudyService.selectTBranchStudyList(tBranchStudy);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出支部党课学习列表
+     */
+    @PreAuthorize("@ss.hasPermi('branch:study:export')")
+    @Log(title = "支部党课学习", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, TBranchStudy tBranchStudy)
+    {
+        List<TBranchStudy> list = tBranchStudyService.selectTBranchStudyList(tBranchStudy);
+        ExcelUtil<TBranchStudy> util = new ExcelUtil<TBranchStudy>(TBranchStudy.class);
+        util.exportExcel(response, list, "支部党课学习数据");
+    }
+
+    /**
+     * 获取支部党课学习详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('branch:study:query')")
+    @GetMapping(value = "/{studyId}")
+    public AjaxResult getInfo(@PathVariable("studyId") Long studyId)
+    {
+        return success(tBranchStudyService.selectTBranchStudyByStudyId(studyId));
+    }
+
+    /**
+     * 新增支部党课学习
+     */
+    @PreAuthorize("@ss.hasPermi('branch:study:add')")
+    @Log(title = "支部党课学习", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TBranchStudy tBranchStudy)
+    {
+        return toAjax(tBranchStudyService.insertTBranchStudy(tBranchStudy));
+    }
+
+    /**
+     * 修改支部党课学习
+     */
+    @PreAuthorize("@ss.hasPermi('branch:study:edit')")
+    @Log(title = "支部党课学习", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TBranchStudy tBranchStudy)
+    {
+        return toAjax(tBranchStudyService.updateTBranchStudy(tBranchStudy));
+    }
+
+    /**
+     * 删除支部党课学习
+     */
+    @PreAuthorize("@ss.hasPermi('branch:study:remove')")
+    @Log(title = "支部党课学习", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{studyIds}")
+    public AjaxResult remove(@PathVariable Long[] studyIds)
+    {
+        return toAjax(tBranchStudyService.deleteTBranchStudyByStudyIds(studyIds));
+    }
+}

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

@@ -0,0 +1,169 @@
+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_study
+ * 
+ * @author ruoyi
+ * @date 2023-06-09
+ */
+public class TBranchStudy extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键id */
+    private Long studyId;
+
+    /** 时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date studyTime;
+
+    /** 地点 */
+    @Excel(name = "地点")
+    private String studyVenue;
+
+    /** 授课人 */
+    @Excel(name = "授课人")
+    private String lecturer;
+
+    /** 记录人 */
+    @Excel(name = "记录人")
+    private String recorder;
+
+    /** 参加人员 */
+    @Excel(name = "参加人员")
+    private String participants;
+
+    /** 缺席人员 */
+    @Excel(name = "缺席人员")
+    private String absentees;
+
+    /** 内容 */
+    @Excel(name = "内容")
+    private String contents;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remarks;
+
+    /** 删除标志（0代表存在 2代表删除） */
+    private String delFlag;
+
+    public void setStudyId(Long studyId) 
+    {
+        this.studyId = studyId;
+    }
+
+    public Long getStudyId() 
+    {
+        return studyId;
+    }
+    public void setStudyTime(Date studyTime) 
+    {
+        this.studyTime = studyTime;
+    }
+
+    public Date getStudyTime() 
+    {
+        return studyTime;
+    }
+    public void setStudyVenue(String studyVenue) 
+    {
+        this.studyVenue = studyVenue;
+    }
+
+    public String getStudyVenue() 
+    {
+        return studyVenue;
+    }
+    public void setLecturer(String lecturer) 
+    {
+        this.lecturer = lecturer;
+    }
+
+    public String getLecturer() 
+    {
+        return lecturer;
+    }
+    public void setRecorder(String recorder) 
+    {
+        this.recorder = recorder;
+    }
+
+    public String getRecorder() 
+    {
+        return recorder;
+    }
+    public void setParticipants(String participants) 
+    {
+        this.participants = participants;
+    }
+
+    public String getParticipants() 
+    {
+        return participants;
+    }
+    public void setAbsentees(String absentees) 
+    {
+        this.absentees = absentees;
+    }
+
+    public String getAbsentees() 
+    {
+        return absentees;
+    }
+    public void setContents(String contents) 
+    {
+        this.contents = contents;
+    }
+
+    public String getContents() 
+    {
+        return contents;
+    }
+    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;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("studyId", getStudyId())
+            .append("studyTime", getStudyTime())
+            .append("studyVenue", getStudyVenue())
+            .append("lecturer", getLecturer())
+            .append("recorder", getRecorder())
+            .append("participants", getParticipants())
+            .append("absentees", getAbsentees())
+            .append("contents", getContents())
+            .append("remarks", getRemarks())
+            .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/TBranchStudyMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.branch.mapper;
+
+import java.util.List;
+import com.ruoyi.branch.domain.TBranchStudy;
+
+/**
+ * 支部党课学习Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2023-06-09
+ */
+public interface TBranchStudyMapper 
+{
+    /**
+     * 查询支部党课学习
+     * 
+     * @param studyId 支部党课学习主键
+     * @return 支部党课学习
+     */
+    public TBranchStudy selectTBranchStudyByStudyId(Long studyId);
+
+    /**
+     * 查询支部党课学习列表
+     * 
+     * @param tBranchStudy 支部党课学习
+     * @return 支部党课学习集合
+     */
+    public List<TBranchStudy> selectTBranchStudyList(TBranchStudy tBranchStudy);
+
+    /**
+     * 新增支部党课学习
+     * 
+     * @param tBranchStudy 支部党课学习
+     * @return 结果
+     */
+    public int insertTBranchStudy(TBranchStudy tBranchStudy);
+
+    /**
+     * 修改支部党课学习
+     * 
+     * @param tBranchStudy 支部党课学习
+     * @return 结果
+     */
+    public int updateTBranchStudy(TBranchStudy tBranchStudy);
+
+    /**
+     * 删除支部党课学习
+     * 
+     * @param studyId 支部党课学习主键
+     * @return 结果
+     */
+    public int deleteTBranchStudyByStudyId(Long studyId);
+
+    /**
+     * 批量删除支部党课学习
+     * 
+     * @param studyIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteTBranchStudyByStudyIds(Long[] studyIds);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.branch.service;
+
+import java.util.List;
+import com.ruoyi.branch.domain.TBranchStudy;
+
+/**
+ * 支部党课学习Service接口
+ * 
+ * @author ruoyi
+ * @date 2023-06-09
+ */
+public interface ITBranchStudyService 
+{
+    /**
+     * 查询支部党课学习
+     * 
+     * @param studyId 支部党课学习主键
+     * @return 支部党课学习
+     */
+    public TBranchStudy selectTBranchStudyByStudyId(Long studyId);
+
+    /**
+     * 查询支部党课学习列表
+     * 
+     * @param tBranchStudy 支部党课学习
+     * @return 支部党课学习集合
+     */
+    public List<TBranchStudy> selectTBranchStudyList(TBranchStudy tBranchStudy);
+
+    /**
+     * 新增支部党课学习
+     * 
+     * @param tBranchStudy 支部党课学习
+     * @return 结果
+     */
+    public int insertTBranchStudy(TBranchStudy tBranchStudy);
+
+    /**
+     * 修改支部党课学习
+     * 
+     * @param tBranchStudy 支部党课学习
+     * @return 结果
+     */
+    public int updateTBranchStudy(TBranchStudy tBranchStudy);
+
+    /**
+     * 批量删除支部党课学习
+     * 
+     * @param studyIds 需要删除的支部党课学习主键集合
+     * @return 结果
+     */
+    public int deleteTBranchStudyByStudyIds(Long[] studyIds);
+
+    /**
+     * 删除支部党课学习信息
+     * 
+     * @param studyId 支部党课学习主键
+     * @return 结果
+     */
+    public int deleteTBranchStudyByStudyId(Long studyId);
+}

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

@@ -0,0 +1,96 @@
+package com.ruoyi.branch.service.impl;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.branch.mapper.TBranchStudyMapper;
+import com.ruoyi.branch.domain.TBranchStudy;
+import com.ruoyi.branch.service.ITBranchStudyService;
+
+/**
+ * 支部党课学习Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2023-06-09
+ */
+@Service
+public class TBranchStudyServiceImpl implements ITBranchStudyService 
+{
+    @Autowired
+    private TBranchStudyMapper tBranchStudyMapper;
+
+    /**
+     * 查询支部党课学习
+     * 
+     * @param studyId 支部党课学习主键
+     * @return 支部党课学习
+     */
+    @Override
+    public TBranchStudy selectTBranchStudyByStudyId(Long studyId)
+    {
+        return tBranchStudyMapper.selectTBranchStudyByStudyId(studyId);
+    }
+
+    /**
+     * 查询支部党课学习列表
+     * 
+     * @param tBranchStudy 支部党课学习
+     * @return 支部党课学习
+     */
+    @Override
+    public List<TBranchStudy> selectTBranchStudyList(TBranchStudy tBranchStudy)
+    {
+        return tBranchStudyMapper.selectTBranchStudyList(tBranchStudy);
+    }
+
+    /**
+     * 新增支部党课学习
+     * 
+     * @param tBranchStudy 支部党课学习
+     * @return 结果
+     */
+    @Override
+    public int insertTBranchStudy(TBranchStudy tBranchStudy)
+    {
+        tBranchStudy.setCreateTime(DateUtils.getNowDate());
+        return tBranchStudyMapper.insertTBranchStudy(tBranchStudy);
+    }
+
+    /**
+     * 修改支部党课学习
+     * 
+     * @param tBranchStudy 支部党课学习
+     * @return 结果
+     */
+    @Override
+    public int updateTBranchStudy(TBranchStudy tBranchStudy)
+    {
+        tBranchStudy.setUpdateTime(DateUtils.getNowDate());
+        return tBranchStudyMapper.updateTBranchStudy(tBranchStudy);
+    }
+
+    /**
+     * 批量删除支部党课学习
+     * 
+     * @param studyIds 需要删除的支部党课学习主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTBranchStudyByStudyIds(Long[] studyIds)
+    {
+        return tBranchStudyMapper.deleteTBranchStudyByStudyIds(studyIds);
+    }
+
+    /**
+     * 删除支部党课学习信息
+     * 
+     * @param studyId 支部党课学习主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTBranchStudyByStudyId(Long studyId)
+    {
+        return tBranchStudyMapper.deleteTBranchStudyByStudyId(studyId);
+    }
+}

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

@@ -0,0 +1,119 @@
+<?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.TBranchStudyMapper">
+    
+    <resultMap type="TBranchStudy" id="TBranchStudyResult">
+        <result property="studyId"    column="study_id"    />
+        <result property="studyTime"    column="study_time"    />
+        <result property="studyVenue"    column="study_venue"    />
+        <result property="lecturer"    column="lecturer"    />
+        <result property="recorder"    column="recorder"    />
+        <result property="participants"    column="participants"    />
+        <result property="absentees"    column="absentees"    />
+        <result property="contents"    column="contents"    />
+        <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"    />
+    </resultMap>
+
+    <sql id="selectTBranchStudyVo">
+        select study_id, study_time, study_venue, lecturer, recorder, participants, absentees, contents, remarks, del_flag, create_by, create_time, update_by, update_time from t_branch_study
+    </sql>
+
+    <select id="selectTBranchStudyList" parameterType="TBranchStudy" resultMap="TBranchStudyResult">
+        <include refid="selectTBranchStudyVo"/>
+        <where>  
+            <if test="studyId != null "> and study_id = #{studyId}</if>
+            <if test="studyTime != null "> and study_time = #{studyTime}</if>
+            <if test="studyVenue != null  and studyVenue != ''"> and study_venue = #{studyVenue}</if>
+            <if test="lecturer != null  and lecturer != ''"> and lecturer = #{lecturer}</if>
+            <if test="recorder != null  and recorder != ''"> and recorder = #{recorder}</if>
+            <if test="participants != null  and participants != ''"> and participants = #{participants}</if>
+            <if test="absentees != null  and absentees != ''"> and absentees = #{absentees}</if>
+            <if test="contents != null  and contents != ''"> and contents = #{contents}</if>
+            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            and del_flag = 0
+        </where>
+    </select>
+    
+    <select id="selectTBranchStudyByStudyId" parameterType="Long" resultMap="TBranchStudyResult">
+        <include refid="selectTBranchStudyVo"/>
+        where study_id = #{studyId}
+        and del_flag = 0
+    </select>
+        
+    <insert id="insertTBranchStudy" parameterType="TBranchStudy">
+        <selectKey keyProperty="studyId" resultType="long" order="BEFORE">
+            SELECT seq_t_branch_study.NEXTVAL as studyId FROM DUAL
+        </selectKey>
+        insert into t_branch_study
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="studyId != null">study_id,</if>
+            <if test="studyTime != null">study_time,</if>
+            <if test="studyVenue != null">study_venue,</if>
+            <if test="lecturer != null">lecturer,</if>
+            <if test="recorder != null">recorder,</if>
+            <if test="participants != null">participants,</if>
+            <if test="absentees != null">absentees,</if>
+            <if test="contents != null">contents,</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>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="studyId != null">#{studyId},</if>
+            <if test="studyTime != null">#{studyTime},</if>
+            <if test="studyVenue != null">#{studyVenue},</if>
+            <if test="lecturer != null">#{lecturer},</if>
+            <if test="recorder != null">#{recorder},</if>
+            <if test="participants != null">#{participants},</if>
+            <if test="absentees != null">#{absentees},</if>
+            <if test="contents != null">#{contents},</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>
+         </trim>
+    </insert>
+
+    <update id="updateTBranchStudy" parameterType="TBranchStudy">
+        update t_branch_study
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="studyTime != null">study_time = #{studyTime},</if>
+            <if test="studyVenue != null">study_venue = #{studyVenue},</if>
+            <if test="lecturer != null">lecturer = #{lecturer},</if>
+            <if test="recorder != null">recorder = #{recorder},</if>
+            <if test="participants != null">participants = #{participants},</if>
+            <if test="absentees != null">absentees = #{absentees},</if>
+            <if test="contents != null">contents = #{contents},</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>
+        </trim>
+        where study_id = #{studyId}
+    </update>
+
+    <update id="deleteTBranchStudyByStudyId" parameterType="Long">
+        update t_branch_study set del_flag = 2 where study_id = #{studyId}
+    </update>
+
+    <update id="deleteTBranchStudyByStudyIds" parameterType="String">
+        update t_branch_study set del_flag = 2 where study_id in
+        <foreach item="studyId" collection="array" open="(" separator="," close=")">
+            #{studyId}
+        </foreach>
+    </update>
+</mapper>

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

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询支部党课学习列表
+export function listStudy(query) {
+  return request({
+    url: '/branch/study/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询支部党课学习详细
+export function getStudy(studyId) {
+  return request({
+    url: '/branch/study/' + studyId,
+    method: 'get'
+  })
+}
+
+// 新增支部党课学习
+export function addStudy(data) {
+  return request({
+    url: '/branch/study',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改支部党课学习
+export function updateStudy(data) {
+  return request({
+    url: '/branch/study',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除支部党课学习
+export function delStudy(studyId) {
+  return request({
+    url: '/branch/study/' + studyId,
+    method: 'delete'
+  })
+}

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

@@ -0,0 +1,638 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="时间" prop="studyTime">
+        <el-date-picker clearable style="width: 200px"
+          v-model="queryParams.studyTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="地点" prop="studyVenue">
+        <el-input
+          v-model="queryParams.studyVenue"
+          placeholder="请输入地点"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="授课人" prop="lecturer">
+        <el-input
+          v-model="queryParams.lecturer"
+          placeholder="请输入授课人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="记录人" prop="recorder">
+        <el-input
+          v-model="queryParams.recorder"
+          placeholder="请输入记录人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="参加人员" prop="participants">
+        <el-input
+          v-model="queryParams.participants"
+          placeholder="请输入参加人员"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="缺席人员" prop="absentees">
+        <el-input
+          v-model="queryParams.absentees"
+          placeholder="请输入缺席人员"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="内容" prop="contents">
+        <el-input
+          v-model="queryParams.contents"
+          placeholder="请输入内容"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="备注" prop="remarks">
+        <el-input
+          v-model="queryParams.remarks"
+          placeholder="请输入备注"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </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:study: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:study: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:study: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:study:edit']"
+            >导入</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:study:export']"
+        >导出</el-button>
+      </el-col>
+	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="studyList" @selection-change="handleSelectionChange" :height="clientHeight" border>
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="时间" align="center" prop="studyTime" width="100">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.studyTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="地点" align="center" prop="studyVenue" :formatter="studyVenueFormat" />
+      <el-table-column label="授课人" align="center" prop="lecturer" :formatter="lecturerFormat" />
+      <el-table-column label="记录人" align="center" prop="recorder" :formatter="recorderFormat" />
+      <el-table-column label="参加人员" align="center" prop="participants" :formatter="participantsFormat" width="120" />
+      <el-table-column label="缺席人员" align="center" prop="absentees" :formatter="absenteesFormat" />
+      <el-table-column label="内容" align="center" prop="contents" :formatter="contentsFormat" width="350" />
+      <el-table-column label="备注" align="center" prop="remarks" :formatter="remarksFormat" width="350" />
+      <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:study:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['branch:study: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="studyTime">
+          <el-date-picker clearable size="small" style="width: 200px"
+            v-model="form.studyTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="地点" prop="studyVenue">
+          <el-input v-model="form.studyVenue" placeholder="请输入地点" />
+        </el-form-item>
+        <el-form-item label="授课人" prop="lecturer">
+          <el-input v-model="form.lecturer" placeholder="请输入授课人" />
+        </el-form-item>
+        <el-form-item label="记录人" prop="recorder">
+          <el-input v-model="form.recorder" placeholder="请输入记录人" />
+        </el-form-item>
+        <el-form-item label="参加人员" prop="participants">
+          <el-input v-model="form.participants" placeholder="请输入参加人员" />
+        </el-form-item>
+        <el-form-item label="缺席人员" prop="absentees">
+          <el-input v-model="form.absentees" placeholder="请输入缺席人员" />
+        </el-form-item>
+        <el-form-item label="内容" prop="contents">
+          <el-input v-model="form.contents" placeholder="请输入内容" type="textarea" rows="4" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remarks">
+          <el-input v-model="form.remarks" placeholder="请输入备注" type="textarea" rows="4" />
+        </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>
+  </div>
+</template>
+
+<script>
+import { listStudy, getStudy, delStudy, addStudy, updateStudy, exportStudy, importTemplate} from "@/api/branch/study";
+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";
+
+export default {
+  name: "Study",
+  components: { Treeselect },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: false,
+      // 总条数
+      total: 0,
+      // 支部党课学习表格数据
+      studyList: [],
+      // 弹出层标题
+      title: "",
+      // 部门树选项
+      deptOptions: undefined,
+      clientHeight:300,
+      // 是否显示弹出层
+      open: false,
+      // 主键id字典
+      studyIdOptions: [],
+      // 时间字典
+      studyTimeOptions: [],
+      // 地点字典
+      studyVenueOptions: [],
+      // 授课人字典
+      lecturerOptions: [],
+      // 记录人字典
+      recorderOptions: [],
+      // 参加人员字典
+      participantsOptions: [],
+      // 缺席人员字典
+      absenteesOptions: [],
+      // 内容字典
+      contentsOptions: [],
+      // 备注字典
+      remarksOptions: [],
+      // 删除标志字典
+      delFlagOptions: [],
+      // 创建者字典
+      createByOptions: [],
+      // 创建时间字典
+      createTimeOptions: [],
+      // 更新者字典
+      updateByOptions: [],
+      // 更新时间字典
+      updateTimeOptions: [],
+        // 用户导入参数
+        upload: {
+            // 是否显示弹出层（用户导入）
+            open: false,
+            // 弹出层标题（用户导入）
+            title: "",
+            // 是否禁用上传
+            isUploading: false,
+            // 是否更新已经存在的用户数据
+            updateSupport: 0,
+            // 设置上传的请求头部
+            headers: { Authorization: "Bearer " + getToken() },
+            // 上传的地址
+            url: process.env.VUE_APP_BASE_API + "/branch/study/importData"
+        },
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        studyId: null,
+
+        studyTime: null,
+
+        studyVenue: null,
+
+        lecturer: null,
+
+        recorder: null,
+
+        participants: null,
+
+        absentees: null,
+
+        contents: null,
+
+        remarks: null,
+
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        // studyId: [
+        //   { 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();
+    this.getDicts("${column.dictType}").then(response => {
+      this.studyIdOptions = response.data;
+    });
+    this.getDicts("${column.dictType}").then(response => {
+      this.studyTimeOptions = response.data;
+    });
+    this.getDicts("${column.dictType}").then(response => {
+      this.studyVenueOptions = response.data;
+    });
+    this.getDicts("${column.dictType}").then(response => {
+      this.lecturerOptions = response.data;
+    });
+    this.getDicts("${column.dictType}").then(response => {
+      this.recorderOptions = response.data;
+    });
+    this.getDicts("${column.dictType}").then(response => {
+      this.participantsOptions = response.data;
+    });
+    this.getDicts("${column.dictType}").then(response => {
+      this.absenteesOptions = response.data;
+    });
+    this.getDicts("${column.dictType}").then(response => {
+      this.contentsOptions = response.data;
+    });
+    this.getDicts("${column.dictType}").then(response => {
+      this.remarksOptions = response.data;
+    });
+    this.getDicts("${column.dictType}").then(response => {
+      this.delFlagOptions = response.data;
+    });
+    this.getDicts("${column.dictType}").then(response => {
+      this.createByOptions = response.data;
+    });
+    this.getDicts("${column.dictType}").then(response => {
+      this.createTimeOptions = response.data;
+    });
+    this.getDicts("${column.dictType}").then(response => {
+      this.updateByOptions = response.data;
+    });
+    this.getDicts("${column.dictType}").then(response => {
+      this.updateTimeOptions = response.data;
+    });
+  },
+  methods: {
+    /** 查询支部党课学习列表 */
+    getList() {
+      this.loading = true;
+      listStudy(this.queryParams).then(response => {
+        this.studyList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+     // /** 查询部门下拉树结构 */
+     // getTreeselect() {
+     //      treeselect().then(response => {
+     //          this.deptOptions = response.data;
+     //      });
+     // },
+    // 主键id字典翻译
+    studyIdFormat(row, column) {
+      return this.selectDictLabel(this.studyIdOptions, row.studyId);
+    },
+    // 时间字典翻译
+    studyTimeFormat(row, column) {
+      return this.selectDictLabel(this.studyTimeOptions, row.studyTime);
+    },
+    // 地点字典翻译
+    studyVenueFormat(row, column) {
+      return this.selectDictLabel(this.studyVenueOptions, row.studyVenue);
+    },
+    // 授课人字典翻译
+    lecturerFormat(row, column) {
+      return this.selectDictLabel(this.lecturerOptions, row.lecturer);
+    },
+    // 记录人字典翻译
+    recorderFormat(row, column) {
+      return this.selectDictLabel(this.recorderOptions, row.recorder);
+    },
+    // 参加人员字典翻译
+    participantsFormat(row, column) {
+      return this.selectDictLabel(this.participantsOptions, row.participants);
+    },
+    // 缺席人员字典翻译
+    absenteesFormat(row, column) {
+      return this.selectDictLabel(this.absenteesOptions, row.absentees);
+    },
+    // 内容字典翻译
+    contentsFormat(row, column) {
+      return this.selectDictLabel(this.contentsOptions, row.contents);
+    },
+    // 备注字典翻译
+    remarksFormat(row, column) {
+      return this.selectDictLabel(this.remarksOptions, row.remarks);
+    },
+    // 删除标志字典翻译
+    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 = {
+        studyId: null,
+
+        studyTime: null,
+
+        studyVenue: null,
+
+        lecturer: null,
+
+        recorder: null,
+
+        participants: null,
+
+        absentees: null,
+
+        contents: null,
+
+        remarks: 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.studyId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加支部党课学习";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const studyId = row.studyId || this.ids
+      getStudy(studyId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改支部党课学习";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.studyId != null) {
+            updateStudy(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addStudy(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const studyIds = row.studyId || this.ids;
+      this.$confirm('是否确认删除?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delStudy(studyIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有支部党课学习数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return exportStudy(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>