民主生活会议

ruoyi-admin/src/main/java/com/ruoyi/web/controller/branch/TBranchDemocraticController.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.TBranchDemocratic;
+import com.ruoyi.branch.service.ITBranchDemocraticService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 民主生活会Controller
+ * 
+ * @author ruoyi
+ * @date 2023-07-20
+ */
+@RestController
+@RequestMapping("/branch/democratic")
+public class TBranchDemocraticController extends BaseController
+{
+    @Autowired
+    private ITBranchDemocraticService tBranchDemocraticService;
+
+    /**
+     * 查询民主生活会列表
+     */
+    @PreAuthorize("@ss.hasPermi('branch:democratic:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TBranchDemocratic tBranchDemocratic)
+    {
+        startPage();
+        List<TBranchDemocratic> list = tBranchDemocraticService.selectTBranchDemocraticList(tBranchDemocratic);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出民主生活会列表
+     */
+    @PreAuthorize("@ss.hasPermi('branch:democratic:export')")
+    @Log(title = "民主生活会", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, TBranchDemocratic tBranchDemocratic)
+    {
+        List<TBranchDemocratic> list = tBranchDemocraticService.selectTBranchDemocraticList(tBranchDemocratic);
+        ExcelUtil<TBranchDemocratic> util = new ExcelUtil<TBranchDemocratic>(TBranchDemocratic.class);
+        util.exportExcel(response, list, "民主生活会数据");
+    }
+
+    /**
+     * 获取民主生活会详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('branch:democratic:query')")
+    @GetMapping(value = "/{democraticId}")
+    public AjaxResult getInfo(@PathVariable("democraticId") Long democraticId)
+    {
+        return success(tBranchDemocraticService.selectTBranchDemocraticByDemocraticId(democraticId));
+    }
+
+    /**
+     * 新增民主生活会
+     */
+    @PreAuthorize("@ss.hasPermi('branch:democratic:add')")
+    @Log(title = "民主生活会", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TBranchDemocratic tBranchDemocratic)
+    {
+        return toAjax(tBranchDemocraticService.insertTBranchDemocratic(tBranchDemocratic));
+    }
+
+    /**
+     * 修改民主生活会
+     */
+    @PreAuthorize("@ss.hasPermi('branch:democratic:edit')")
+    @Log(title = "民主生活会", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TBranchDemocratic tBranchDemocratic)
+    {
+        return toAjax(tBranchDemocraticService.updateTBranchDemocratic(tBranchDemocratic));
+    }
+
+    /**
+     * 删除民主生活会
+     */
+    @PreAuthorize("@ss.hasPermi('branch:democratic:remove')")
+    @Log(title = "民主生活会", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{democraticIds}")
+    public AjaxResult remove(@PathVariable Long[] democraticIds)
+    {
+        return toAjax(tBranchDemocraticService.deleteTBranchDemocraticByDemocraticIds(democraticIds));
+    }
+}

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

@@ -0,0 +1,180 @@
+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_democratic
+ * 
+ * @author ruoyi
+ * @date 2023-07-20
+ */
+public class TBranchDemocratic extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键id */
+    @Excel(name = "主键id")
+    private Long democraticId;
+
+    /** 时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date meetingTime;
+
+    /** 地点 */
+    @Excel(name = "地点")
+    private String meetingVenue;
+
+    /** 主持人 */
+    @Excel(name = "主持人")
+    private String host;
+
+    /** 记录人 */
+    @Excel(name = "记录人")
+    private String recorder;
+
+    /** 参加人员 */
+    @Excel(name = "参加人员")
+    private String participants;
+
+    /** 主要内容 */
+    @Excel(name = "主要内容")
+    private String content;
+
+    /** 发言记录 */
+    @Excel(name = "发言记录")
+    private String records;
+
+    /** 删除标志（0代表存在 2代表删除） */
+    private String delFlag;
+
+    /** 部门id */
+    @Excel(name = "部门id")
+    private Long deptId;
+
+    public void setDemocraticId(Long democraticId) 
+    {
+        this.democraticId = democraticId;
+    }
+
+    public Long getDemocraticId() 
+    {
+        return democraticId;
+    }
+
+    public void setMeetingTime(Date meetingTime) 
+    {
+        this.meetingTime = meetingTime;
+    }
+
+    public Date getMeetingTime() 
+    {
+        return meetingTime;
+    }
+
+    public void setMeetingVenue(String meetingVenue) 
+    {
+        this.meetingVenue = meetingVenue;
+    }
+
+    public String getMeetingVenue() 
+    {
+        return meetingVenue;
+    }
+
+    public void setHost(String host) 
+    {
+        this.host = host;
+    }
+
+    public String getHost() 
+    {
+        return host;
+    }
+
+    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 setContent(String content) 
+    {
+        this.content = content;
+    }
+
+    public String getContent() 
+    {
+        return content;
+    }
+
+    public void setRecords(String records) 
+    {
+        this.records = records;
+    }
+
+    public String getRecords() 
+    {
+        return records;
+    }
+
+    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;
+    }
+
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("democraticId", getDemocraticId())
+            .append("meetingTime", getMeetingTime())
+            .append("meetingVenue", getMeetingVenue())
+            .append("host", getHost())
+            .append("recorder", getRecorder())
+            .append("participants", getParticipants())
+            .append("content", getContent())
+            .append("records", getRecords())
+            .append("delFlag", getDelFlag())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("deptId", getDeptId())
+            .toString();
+    }
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.branch.mapper;
+
+import java.util.List;
+import com.ruoyi.branch.domain.TBranchDemocratic;
+
+/**
+ * 民主生活会Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2023-07-20
+ */
+public interface TBranchDemocraticMapper 
+{
+    /**
+     * 查询民主生活会
+     * 
+     * @param democraticId 民主生活会主键
+     * @return 民主生活会
+     */
+    public TBranchDemocratic selectTBranchDemocraticByDemocraticId(Long democraticId);
+
+    /**
+     * 查询民主生活会列表
+     * 
+     * @param tBranchDemocratic 民主生活会
+     * @return 民主生活会集合
+     */
+    public List<TBranchDemocratic> selectTBranchDemocraticList(TBranchDemocratic tBranchDemocratic);
+
+    /**
+     * 新增民主生活会
+     * 
+     * @param tBranchDemocratic 民主生活会
+     * @return 结果
+     */
+    public int insertTBranchDemocratic(TBranchDemocratic tBranchDemocratic);
+
+    /**
+     * 修改民主生活会
+     * 
+     * @param tBranchDemocratic 民主生活会
+     * @return 结果
+     */
+    public int updateTBranchDemocratic(TBranchDemocratic tBranchDemocratic);
+
+    /**
+     * 删除民主生活会
+     * 
+     * @param democraticId 民主生活会主键
+     * @return 结果
+     */
+    public int deleteTBranchDemocraticByDemocraticId(Long democraticId);
+
+    /**
+     * 批量删除民主生活会
+     * 
+     * @param democraticIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteTBranchDemocraticByDemocraticIds(Long[] democraticIds);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.branch.service;
+
+import java.util.List;
+import com.ruoyi.branch.domain.TBranchDemocratic;
+
+/**
+ * 民主生活会Service接口
+ * 
+ * @author ruoyi
+ * @date 2023-07-20
+ */
+public interface ITBranchDemocraticService 
+{
+    /**
+     * 查询民主生活会
+     * 
+     * @param democraticId 民主生活会主键
+     * @return 民主生活会
+     */
+    public TBranchDemocratic selectTBranchDemocraticByDemocraticId(Long democraticId);
+
+    /**
+     * 查询民主生活会列表
+     * 
+     * @param tBranchDemocratic 民主生活会
+     * @return 民主生活会集合
+     */
+    public List<TBranchDemocratic> selectTBranchDemocraticList(TBranchDemocratic tBranchDemocratic);
+
+    /**
+     * 新增民主生活会
+     * 
+     * @param tBranchDemocratic 民主生活会
+     * @return 结果
+     */
+    public int insertTBranchDemocratic(TBranchDemocratic tBranchDemocratic);
+
+    /**
+     * 修改民主生活会
+     * 
+     * @param tBranchDemocratic 民主生活会
+     * @return 结果
+     */
+    public int updateTBranchDemocratic(TBranchDemocratic tBranchDemocratic);
+
+    /**
+     * 批量删除民主生活会
+     * 
+     * @param democraticIds 需要删除的民主生活会主键集合
+     * @return 结果
+     */
+    public int deleteTBranchDemocraticByDemocraticIds(Long[] democraticIds);
+
+    /**
+     * 删除民主生活会信息
+     * 
+     * @param democraticId 民主生活会主键
+     * @return 结果
+     */
+    public int deleteTBranchDemocraticByDemocraticId(Long democraticId);
+}

ruoyi-system/src/main/java/com/ruoyi/branch/service/impl/TBranchDemocraticServiceImpl.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.TBranchDemocraticMapper;
+import com.ruoyi.branch.domain.TBranchDemocratic;
+import com.ruoyi.branch.service.ITBranchDemocraticService;
+
+/**
+ * 民主生活会Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2023-07-20
+ */
+@Service
+public class TBranchDemocraticServiceImpl implements ITBranchDemocraticService 
+{
+    @Autowired
+    private TBranchDemocraticMapper tBranchDemocraticMapper;
+
+    /**
+     * 查询民主生活会
+     * 
+     * @param democraticId 民主生活会主键
+     * @return 民主生活会
+     */
+    @Override
+    public TBranchDemocratic selectTBranchDemocraticByDemocraticId(Long democraticId)
+    {
+        return tBranchDemocraticMapper.selectTBranchDemocraticByDemocraticId(democraticId);
+    }
+
+    /**
+     * 查询民主生活会列表
+     * 
+     * @param tBranchDemocratic 民主生活会
+     * @return 民主生活会
+     */
+    @Override
+    @DataScope(deptAlias = "d", userAlias = "u")
+    public List<TBranchDemocratic> selectTBranchDemocraticList(TBranchDemocratic tBranchDemocratic)
+    {
+        return tBranchDemocraticMapper.selectTBranchDemocraticList(tBranchDemocratic);
+    }
+
+    /**
+     * 新增民主生活会
+     * 
+     * @param tBranchDemocratic 民主生活会
+     * @return 结果
+     */
+    @Override
+    public int insertTBranchDemocratic(TBranchDemocratic tBranchDemocratic)
+    {
+        tBranchDemocratic.setCreateTime(DateUtils.getNowDate());
+        return tBranchDemocraticMapper.insertTBranchDemocratic(tBranchDemocratic);
+    }
+
+    /**
+     * 修改民主生活会
+     * 
+     * @param tBranchDemocratic 民主生活会
+     * @return 结果
+     */
+    @Override
+    public int updateTBranchDemocratic(TBranchDemocratic tBranchDemocratic)
+    {
+        tBranchDemocratic.setUpdateTime(DateUtils.getNowDate());
+        return tBranchDemocraticMapper.updateTBranchDemocratic(tBranchDemocratic);
+    }
+
+    /**
+     * 批量删除民主生活会
+     * 
+     * @param democraticIds 需要删除的民主生活会主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTBranchDemocraticByDemocraticIds(Long[] democraticIds)
+    {
+        return tBranchDemocraticMapper.deleteTBranchDemocraticByDemocraticIds(democraticIds);
+    }
+
+    /**
+     * 删除民主生活会信息
+     * 
+     * @param democraticId 民主生活会主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTBranchDemocraticByDemocraticId(Long democraticId)
+    {
+        return tBranchDemocraticMapper.deleteTBranchDemocraticByDemocraticId(democraticId);
+    }
+}

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

@@ -0,0 +1,121 @@
+<?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.TBranchDemocraticMapper">
+    
+    <resultMap type="TBranchDemocratic" id="TBranchDemocraticResult">
+        <result property="democraticId"    column="democratic_id"    />
+        <result property="meetingTime"    column="meeting_time"    />
+        <result property="meetingVenue"    column="meeting_venue"    />
+        <result property="host"    column="host"    />
+        <result property="recorder"    column="recorder"    />
+        <result property="participants"    column="participants"    />
+        <result property="content"    column="content"    />
+        <result property="records"    column="records"    />
+        <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"    />
+    </resultMap>
+
+    <sql id="selectTBranchDemocraticVo">
+        select u.democratic_id, u.meeting_time, u.meeting_venue, u.host, u.recorder, u.participants, u.content, u.records, u.del_flag, u.create_by, u.create_time, u.update_by, u.update_time, u.dept_id from t_branch_democratic u left join sys_dept d on u.dept_id = d.dept_id
+    </sql>
+
+    <select id="selectTBranchDemocraticList" parameterType="TBranchDemocratic" resultMap="TBranchDemocraticResult">
+        <include refid="selectTBranchDemocraticVo"/>
+        <where>  
+            <if test="democraticId != null "> and u.democratic_id = #{democraticId}</if>
+            <if test="meetingTime != null "> and u.meeting_time = #{meetingTime}</if>
+            <if test="meetingVenue != null  and meetingVenue != ''"> and u.meeting_venue like concat(concat('%', #{meetingVenue}), '%')</if>
+            <if test="host != null  and host != ''"> and u.host = #{host}</if>
+            <if test="recorder != null  and recorder != ''"> and u.recorder = #{recorder}</if>
+            <if test="participants != null  and participants != ''"> and u.participants = #{participants})</if>
+            <if test="content != null  and content != ''"> and u.content like concat(concat('%', #{content}), '%')</if>
+            <if test="records != null  and records != ''"> and u.records like concat(concat('%', #{records}), '%')</if>
+            <if test="deptId != null "> and u.dept_id = #{deptId}</if>
+            and u.del_flag = 0
+        </where>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+    </select>
+    
+    <select id="selectTBranchDemocraticByDemocraticId" parameterType="Long" resultMap="TBranchDemocraticResult">
+        <include refid="selectTBranchDemocraticVo"/>
+        where u.democratic_id = #{democraticId}
+        and u.del_flag = 0
+    </select>
+        
+    <insert id="insertTBranchDemocratic" parameterType="TBranchDemocratic">
+        <selectKey keyProperty="democraticId" resultType="long" order="BEFORE">
+            SELECT seq_t_branch_democratic.NEXTVAL as democraticId FROM DUAL
+        </selectKey>
+        insert into t_branch_democratic
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="democraticId != null">democratic_id,</if>
+            <if test="meetingTime != null">meeting_time,</if>
+            <if test="meetingVenue != null">meeting_venue,</if>
+            <if test="host != null">host,</if>
+            <if test="recorder != null">recorder,</if>
+            <if test="participants != null">participants,</if>
+            <if test="content != null">content,</if>
+            <if test="records != null">records,</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>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="democraticId != null">#{democraticId},</if>
+            <if test="meetingTime != null">#{meetingTime},</if>
+            <if test="meetingVenue != null">#{meetingVenue},</if>
+            <if test="host != null">#{host},</if>
+            <if test="recorder != null">#{recorder},</if>
+            <if test="participants != null">#{participants},</if>
+            <if test="content != null">#{content},</if>
+            <if test="records != null">#{records},</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>
+         </trim>
+    </insert>
+
+    <update id="updateTBranchDemocratic" parameterType="TBranchDemocratic">
+        update t_branch_democratic
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="meetingTime != null">meeting_time = #{meetingTime},</if>
+            <if test="meetingVenue != null">meeting_venue = #{meetingVenue},</if>
+            <if test="host != null">host = #{host},</if>
+            <if test="recorder != null">recorder = #{recorder},</if>
+            <if test="participants != null">participants = #{participants},</if>
+            <if test="content != null">content = #{content},</if>
+            <if test="records != null">records = #{records},</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>
+        </trim>
+        where democratic_id = #{democraticId}
+    </update>
+
+    <update id="deleteTBranchDemocraticByDemocraticId" parameterType="Long">
+        update t_branch_democratic set del_flag = 2 where democratic_id = #{democraticId}
+    </update>
+
+    <update id="deleteTBranchDemocraticByDemocraticIds" parameterType="String">
+        update t_branch_democratic set del_flag = 2 where democratic_id in
+        <foreach item="democraticId" collection="array" open="(" separator="," close=")">
+            #{democraticId}
+        </foreach>
+    </update>
+</mapper>

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

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询民主生活会列表
+export function listDemocratic(query) {
+  return request({
+    url: '/branch/democratic/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询民主生活会详细
+export function getDemocratic(democraticId) {
+  return request({
+    url: '/branch/democratic/' + democraticId,
+    method: 'get'
+  })
+}
+
+// 新增民主生活会
+export function addDemocratic(data) {
+  return request({
+    url: '/branch/democratic',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改民主生活会
+export function updateDemocratic(data) {
+  return request({
+    url: '/branch/democratic',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除民主生活会
+export function delDemocratic(democraticId) {
+  return request({
+    url: '/branch/democratic/' + democraticId,
+    method: 'delete'
+  })
+}

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

@@ -0,0 +1,574 @@
+<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="meetingTime">
+        <el-date-picker clearable size="small" style="width: 200px"
+          v-model="queryParams.meetingTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="地点" prop="meetingVenue">
+        <el-input
+          v-model="queryParams.meetingVenue"
+          placeholder="请输入地点"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="主要内容" prop="content">
+        <el-input
+          v-model="queryParams.content"
+          placeholder="请输入主要内容"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="发言记录" prop="records">
+        <el-input
+          v-model="queryParams.records"
+          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:democratic: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:democratic: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:democratic: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:democratic: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:democratic:export']"
+        >导出</el-button>
+      </el-col>
+	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="democraticList" @selection-change="handleSelectionChange" :height="clientHeight" border>
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="时间" align="center" prop="meetingTime" width="100">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.meetingTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="地点" align="center" prop="meetingVenue" width="120" />
+      <el-table-column label="主持人" align="center" prop="hostString" width="120"/>
+      <el-table-column label="记录人" align="center" prop="recorderString" width="120"/>
+      <el-table-column label="参加人员" align="center" prop="participantsString" width="120"/>
+      <el-table-column label="主要内容" align="left" prop="content" width="350" />
+      <el-table-column label="发言记录" align="left" prop="records" 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:democratic:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['branch:democratic: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="800px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="时间" prop="meetingTime">
+              <el-date-picker clearable size="small" style="width: 200px"
+                              v-model="form.meetingTime"
+                              type="date"
+                              value-format="yyyy-MM-dd"
+                              placeholder="选择时间">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="地点" prop="meetingVenue">
+              <el-input v-model="form.meetingVenue" placeholder="请输入地点" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="主持人" prop="host">
+              <el-select v-model="form.host" multiple placeholder="请选择主持人">
+                <el-option
+                  v-for="dict in userList"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="记录人" prop="recorder">
+              <el-select v-model="form.recorder" multiple placeholder="请选择记录人">
+                <el-option
+                  v-for="dict in userList"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="参加人员" prop="participants">
+              <el-select v-model="form.participants" multiple placeholder="请选择参加人员">
+                <el-option
+                  v-for="dict in userList"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="归属部门" prop="deptId">
+              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="主要内容" prop="content">
+              <el-input v-model="form.content" type="textarea" placeholder="请输入内容" rows="4" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="发言记录" prop="records">
+              <el-input v-model="form.records" type="textarea" placeholder="请输入内容" rows="4" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </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 { listDemocratic, getDemocratic, delDemocratic, addDemocratic, updateDemocratic, exportDemocratic, importTemplate} from "@/api/branch/democratic";
+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 { listUser} from "@/api/system/user";
+
+export default {
+  name: "Democratic",
+  components: { Treeselect },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: false,
+      // 总条数
+      total: 0,
+      // 民主生活会表格数据
+      democraticList: [],
+      // 弹出层标题
+      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/democratic/importData"
+        },
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        democraticId: null,
+        meetingTime: null,
+        meetingVenue: null,
+        host: null,
+        recorder: null,
+        participants: null,
+        content: null,
+        records: null,
+        deptId: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        meetingTime: [
+          { required: true, message: "时间不能为空", trigger: "blur" }
+        ],
+        meetingVenue: [
+          { required: true, message: "地点不能为空", trigger: "blur" }
+        ],
+        deptId: [
+          { required: true, message: "归属部门不能为空", trigger: "blur" }
+        ],
+      },
+      // 用户列表
+      userList: [],
+    };
+  },
+  watch: {
+        // 根据名称筛选部门树
+        deptName(val) {
+            this.$refs.tree.filter(val);
+        }
+   },
+  created() {
+      //设置表格高度对应屏幕高度
+      this.$nextTick(() => {
+          this.clientHeight = document.body.clientHeight -250
+      })
+    this.getList();
+    this.getTreeselect();
+  },
+  methods: {
+    /** 查询民主生活会列表 */
+    getList() {
+      this.loading = true;
+      listUser().then(response => {
+        let rows = response.rows;
+        let userList = [];
+        for(let i = 0; i < rows.length; i++) {
+          if (rows[i].userName != "admin") {
+            let user = { "dictValue" : rows[i].userId, "dictLabel" : rows[i].nickName};
+            userList.push(user);
+          }
+        }
+        this.userList = userList;
+        listDemocratic(this.queryParams).then(response => {
+          this.democraticList = response.rows;
+          for (let i = 0; i < this.democraticList.length; i++) {
+            if (this.democraticList[i].host != null) {
+              let host = this.democraticList[i].host.split(",");
+              let hostString = "";
+              for (let j = 0; j < host.length; j++) {
+                if (j > 0) {
+                  hostString += "、" + this.selectDictLabel(this.userList, host[j]);
+                } else {
+                  hostString += this.selectDictLabel(this.userList, host[j]);
+                }
+              }
+              this.democraticList[i].hostString = hostString;
+            }
+            if (this.democraticList[i].recorder != null) {
+              let recorder = this.democraticList[i].recorder.split(",");
+              let recorderString = "";
+              for (let j = 0; j < recorder.length; j++) {
+                if (j > 0) {
+                  recorderString += "、" + this.selectDictLabel(this.userList, recorder[j]);
+                } else {
+                  recorderString += this.selectDictLabel(this.userList, recorder[i]);
+                }
+              }
+              this.democraticList[i].recorderString = recorderString;
+            }
+            if (this.democraticList[i].participants != null) {
+              let participants = this.democraticList[i].participants.split(",");
+              let participantsString = "";
+              for (let j = 0; j < participants.length; j++) {
+                if (j > 0) {
+                  participantsString += "、" + this.selectDictLabel(this.userList, participants[j]);
+                } else {
+                  participantsString += this.selectDictLabel(this.userList, participants[j]);
+                }
+              }
+              this.democraticList[i].participantsString = participantsString;
+            }
+          }
+          this.total = response.total;
+          this.loading = false;
+        });
+      });
+    },
+     /** 查询部门下拉树结构 */
+     getTreeselect() {
+          treeselect().then(response => {
+              this.deptOptions = response.data;
+          });
+     },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        democraticId: null,
+        meetingTime: null,
+        meetingVenue: null,
+        host: null,
+        recorder: null,
+        participants: null,
+        content: null,
+        records: null,
+        delFlag: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        deptId: 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.democraticId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加民主生活会";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const democraticId = row.democraticId || this.ids
+      getDemocratic(democraticId).then(response => {
+        this.form = response.data;
+        if (this.form.host != null) {
+          this.form.host = this.form.host.split(",").map(Number);
+        }
+        if (this.form.recorder != null) {
+          this.form.recorder = this.form.recorder.split(",").map(Number);
+        }
+        if (this.form.participants != null) {
+          this.form.participants = this.form.participants.split(",").map(Number);
+        }
+        this.open = true;
+        this.title = "修改民主生活会";
+      });
+    },
+      /** 提交按钮 */
+      submitForm() {
+        if (this.form.host != null) {
+          this.form.host = this.form.host.join();
+        }
+        if (this.form.recorder != null) {
+          this.form.recorder = this.form.recorder.join();
+        }
+        if (this.form.participants != null) {
+          this.form.participants = this.form.participants.join();
+        }
+          this.$refs["form"].validate(valid => {
+              if (valid) {
+                  if (this.form.democraticId != null) {
+                      updateDemocratic(this.form).then(response => {
+                          this.$modal.msgSuccess("修改成功");
+                          this.open = false;
+                          this.getList();
+                      });
+                  } else {
+                      addDemocratic(this.form).then(response => {
+                          this.$modal.msgSuccess("新增成功");
+                          this.open = false;
+                          this.getList();
+                      });
+                  }
+              }
+          });
+      },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const democraticIds = row.democraticId || this.ids;
+      this.$confirm('是否确认删除?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delDemocratic(democraticIds);
+        }).then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有民主生活会数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return exportDemocratic(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>