支部会议管理

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

@@ -0,0 +1,105 @@
+package com.ruoyi.web.controller.branch;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.branch.domain.TBranchMeetingMgr;
+import com.ruoyi.branch.service.ITBranchMeetingMgrService;
+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.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 支部会议管理Controller
+ * 
+ * @author ruoyi
+ * @date 2023-06-07
+ */
+@RestController
+@RequestMapping("/system/mgr")
+public class TBranchMeetingMgrController extends BaseController
+{
+    @Autowired
+    private ITBranchMeetingMgrService tBranchMeetingMgrService;
+
+    /**
+     * 查询支部会议管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:mgr:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TBranchMeetingMgr tBranchMeetingMgr)
+    {
+        startPage();
+        List<TBranchMeetingMgr> list = tBranchMeetingMgrService.selectTBranchMeetingMgrList(tBranchMeetingMgr);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出支部会议管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:mgr:export')")
+    @Log(title = "支部会议管理", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, TBranchMeetingMgr tBranchMeetingMgr)
+    {
+        List<TBranchMeetingMgr> list = tBranchMeetingMgrService.selectTBranchMeetingMgrList(tBranchMeetingMgr);
+        ExcelUtil<TBranchMeetingMgr> util = new ExcelUtil<TBranchMeetingMgr>(TBranchMeetingMgr.class);
+        util.exportExcel(response, list, "支部会议管理数据");
+    }
+
+    /**
+     * 获取支部会议管理详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:mgr:query')")
+    @GetMapping(value = "/{meetingId}")
+    public AjaxResult getInfo(@PathVariable("meetingId") Long meetingId)
+    {
+        return success(tBranchMeetingMgrService.selectTBranchMeetingMgrByMeetingId(meetingId));
+    }
+
+    /**
+     * 新增支部会议管理
+     */
+    @PreAuthorize("@ss.hasPermi('system:mgr:add')")
+    @Log(title = "支部会议管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TBranchMeetingMgr tBranchMeetingMgr)
+    {
+        return toAjax(tBranchMeetingMgrService.insertTBranchMeetingMgr(tBranchMeetingMgr));
+    }
+
+    /**
+     * 修改支部会议管理
+     */
+    @PreAuthorize("@ss.hasPermi('system:mgr:edit')")
+    @Log(title = "支部会议管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TBranchMeetingMgr tBranchMeetingMgr)
+    {
+        return toAjax(tBranchMeetingMgrService.updateTBranchMeetingMgr(tBranchMeetingMgr));
+    }
+
+    /**
+     * 删除支部会议管理
+     */
+    @PreAuthorize("@ss.hasPermi('system:mgr:remove')")
+    @Log(title = "支部会议管理", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{meetingIds}")
+    public AjaxResult remove(@PathVariable Long[] meetingIds)
+    {
+        return toAjax(tBranchMeetingMgrService.deleteTBranchMeetingMgrByMeetingIds(meetingIds));
+    }
+}

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

@@ -0,0 +1,211 @@
+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_meeting_mgr
+ * 
+ * @author ruoyi
+ * @date 2023-06-07
+ */
+public class TBranchMeetingMgr extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键id */
+    private Long meetingId;
+
+    /** 会议类型 */
+    @Excel(name = "会议类型")
+    private String meetingType;
+
+    /** 时间 */
+    @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 absentees;
+
+    /** 列席人员 */
+    @Excel(name = "列席人员")
+    private String attendees;
+
+    /** 主要议题 */
+    @Excel(name = "主要议题")
+    private String mainTopics;
+
+    /** 形成决议 */
+    @Excel(name = "形成决议")
+    private String resolutionsFormed;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remarks;
+
+    /** 删除标志（0代表存在 2代表删除） */
+    private String delFlag;
+
+    public void setMeetingId(Long meetingId) 
+    {
+        this.meetingId = meetingId;
+    }
+
+    public Long getMeetingId() 
+    {
+        return meetingId;
+    }
+    public void setMeetingType(String meetingType) 
+    {
+        this.meetingType = meetingType;
+    }
+
+    public String getMeetingType() 
+    {
+        return meetingType;
+    }
+    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 setAbsentees(String absentees) 
+    {
+        this.absentees = absentees;
+    }
+
+    public String getAbsentees() 
+    {
+        return absentees;
+    }
+    public void setAttendees(String attendees) 
+    {
+        this.attendees = attendees;
+    }
+
+    public String getAttendees() 
+    {
+        return attendees;
+    }
+    public void setMainTopics(String mainTopics) 
+    {
+        this.mainTopics = mainTopics;
+    }
+
+    public String getMainTopics() 
+    {
+        return mainTopics;
+    }
+    public void setResolutionsFormed(String resolutionsFormed) 
+    {
+        this.resolutionsFormed = resolutionsFormed;
+    }
+
+    public String getResolutionsFormed() 
+    {
+        return resolutionsFormed;
+    }
+    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("meetingId", getMeetingId())
+            .append("meetingType", getMeetingType())
+            .append("meetingTime", getMeetingTime())
+            .append("meetingVenue", getMeetingVenue())
+            .append("host", getHost())
+            .append("recorder", getRecorder())
+            .append("participants", getParticipants())
+            .append("absentees", getAbsentees())
+            .append("attendees", getAttendees())
+            .append("mainTopics", getMainTopics())
+            .append("resolutionsFormed", getResolutionsFormed())
+            .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/TBranchMeetingMgrMapper.java

@@ -0,0 +1,62 @@
+package com.ruoyi.branch.mapper;
+
+import com.ruoyi.branch.domain.TBranchMeetingMgr;
+
+import java.util.List;
+
+/**
+ * 支部会议管理Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2023-06-07
+ */
+public interface TBranchMeetingMgrMapper 
+{
+    /**
+     * 查询支部会议管理
+     * 
+     * @param meetingId 支部会议管理主键
+     * @return 支部会议管理
+     */
+    public TBranchMeetingMgr selectTBranchMeetingMgrByMeetingId(Long meetingId);
+
+    /**
+     * 查询支部会议管理列表
+     * 
+     * @param tBranchMeetingMgr 支部会议管理
+     * @return 支部会议管理集合
+     */
+    public List<TBranchMeetingMgr> selectTBranchMeetingMgrList(TBranchMeetingMgr tBranchMeetingMgr);
+
+    /**
+     * 新增支部会议管理
+     * 
+     * @param tBranchMeetingMgr 支部会议管理
+     * @return 结果
+     */
+    public int insertTBranchMeetingMgr(TBranchMeetingMgr tBranchMeetingMgr);
+
+    /**
+     * 修改支部会议管理
+     * 
+     * @param tBranchMeetingMgr 支部会议管理
+     * @return 结果
+     */
+    public int updateTBranchMeetingMgr(TBranchMeetingMgr tBranchMeetingMgr);
+
+    /**
+     * 删除支部会议管理
+     * 
+     * @param meetingId 支部会议管理主键
+     * @return 结果
+     */
+    public int deleteTBranchMeetingMgrByMeetingId(Long meetingId);
+
+    /**
+     * 批量删除支部会议管理
+     * 
+     * @param meetingIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteTBranchMeetingMgrByMeetingIds(Long[] meetingIds);
+}

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

@@ -0,0 +1,62 @@
+package com.ruoyi.branch.service;
+
+import com.ruoyi.branch.domain.TBranchMeetingMgr;
+
+import java.util.List;
+
+/**
+ * 支部会议管理Service接口
+ * 
+ * @author ruoyi
+ * @date 2023-06-07
+ */
+public interface ITBranchMeetingMgrService 
+{
+    /**
+     * 查询支部会议管理
+     * 
+     * @param meetingId 支部会议管理主键
+     * @return 支部会议管理
+     */
+    public TBranchMeetingMgr selectTBranchMeetingMgrByMeetingId(Long meetingId);
+
+    /**
+     * 查询支部会议管理列表
+     * 
+     * @param tBranchMeetingMgr 支部会议管理
+     * @return 支部会议管理集合
+     */
+    public List<TBranchMeetingMgr> selectTBranchMeetingMgrList(TBranchMeetingMgr tBranchMeetingMgr);
+
+    /**
+     * 新增支部会议管理
+     * 
+     * @param tBranchMeetingMgr 支部会议管理
+     * @return 结果
+     */
+    public int insertTBranchMeetingMgr(TBranchMeetingMgr tBranchMeetingMgr);
+
+    /**
+     * 修改支部会议管理
+     * 
+     * @param tBranchMeetingMgr 支部会议管理
+     * @return 结果
+     */
+    public int updateTBranchMeetingMgr(TBranchMeetingMgr tBranchMeetingMgr);
+
+    /**
+     * 批量删除支部会议管理
+     * 
+     * @param meetingIds 需要删除的支部会议管理主键集合
+     * @return 结果
+     */
+    public int deleteTBranchMeetingMgrByMeetingIds(Long[] meetingIds);
+
+    /**
+     * 删除支部会议管理信息
+     * 
+     * @param meetingId 支部会议管理主键
+     * @return 结果
+     */
+    public int deleteTBranchMeetingMgrByMeetingId(Long meetingId);
+}

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

@@ -0,0 +1,97 @@
+package com.ruoyi.branch.service.impl;
+
+import java.util.List;
+
+import com.ruoyi.branch.domain.TBranchMeetingMgr;
+import com.ruoyi.branch.mapper.TBranchMeetingMgrMapper;
+import com.ruoyi.branch.service.ITBranchMeetingMgrService;
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 支部会议管理Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2023-06-07
+ */
+@Service
+public class TBranchMeetingMgrServiceImpl implements ITBranchMeetingMgrService
+{
+    @Autowired
+    private TBranchMeetingMgrMapper tBranchMeetingMgrMapper;
+
+    /**
+     * 查询支部会议管理
+     * 
+     * @param meetingId 支部会议管理主键
+     * @return 支部会议管理
+     */
+    @Override
+    public TBranchMeetingMgr selectTBranchMeetingMgrByMeetingId(Long meetingId)
+    {
+        return tBranchMeetingMgrMapper.selectTBranchMeetingMgrByMeetingId(meetingId);
+    }
+
+    /**
+     * 查询支部会议管理列表
+     * 
+     * @param tBranchMeetingMgr 支部会议管理
+     * @return 支部会议管理
+     */
+    @Override
+    public List<TBranchMeetingMgr> selectTBranchMeetingMgrList(TBranchMeetingMgr tBranchMeetingMgr)
+    {
+        return tBranchMeetingMgrMapper.selectTBranchMeetingMgrList(tBranchMeetingMgr);
+    }
+
+    /**
+     * 新增支部会议管理
+     * 
+     * @param tBranchMeetingMgr 支部会议管理
+     * @return 结果
+     */
+    @Override
+    public int insertTBranchMeetingMgr(TBranchMeetingMgr tBranchMeetingMgr)
+    {
+        tBranchMeetingMgr.setCreateTime(DateUtils.getNowDate());
+        return tBranchMeetingMgrMapper.insertTBranchMeetingMgr(tBranchMeetingMgr);
+    }
+
+    /**
+     * 修改支部会议管理
+     * 
+     * @param tBranchMeetingMgr 支部会议管理
+     * @return 结果
+     */
+    @Override
+    public int updateTBranchMeetingMgr(TBranchMeetingMgr tBranchMeetingMgr)
+    {
+        tBranchMeetingMgr.setUpdateTime(DateUtils.getNowDate());
+        return tBranchMeetingMgrMapper.updateTBranchMeetingMgr(tBranchMeetingMgr);
+    }
+
+    /**
+     * 批量删除支部会议管理
+     * 
+     * @param meetingIds 需要删除的支部会议管理主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTBranchMeetingMgrByMeetingIds(Long[] meetingIds)
+    {
+        return tBranchMeetingMgrMapper.deleteTBranchMeetingMgrByMeetingIds(meetingIds);
+    }
+
+    /**
+     * 删除支部会议管理信息
+     * 
+     * @param meetingId 支部会议管理主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTBranchMeetingMgrByMeetingId(Long meetingId)
+    {
+        return tBranchMeetingMgrMapper.deleteTBranchMeetingMgrByMeetingId(meetingId);
+    }
+}

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

@@ -0,0 +1,134 @@
+<?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.TBranchMeetingMgrMapper">
+    
+    <resultMap type="TBranchMeetingMgr" id="TBranchMeetingMgrResult">
+        <result property="meetingId"    column="meeting_id"    />
+        <result property="meetingType"    column="meeting_type"    />
+        <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="absentees"    column="absentees"    />
+        <result property="attendees"    column="attendees"    />
+        <result property="mainTopics"    column="main_topics"    />
+        <result property="resolutionsFormed"    column="resolutions_formed"    />
+        <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="selectTBranchMeetingMgrVo">
+        select meeting_id, meeting_type, meeting_time, meeting_venue, host, recorder, participants, absentees, attendees, main_topics, resolutions_formed, remarks, del_flag, create_by, create_time, update_by, update_time from t_branch_meeting_mgr
+    </sql>
+
+    <select id="selectTBranchMeetingMgrList" parameterType="TBranchMeetingMgr" resultMap="TBranchMeetingMgrResult">
+        <include refid="selectTBranchMeetingMgrVo"/>
+        <where>  
+            <if test="meetingId != null "> and meeting_id = #{meetingId}</if>
+            <if test="meetingType != null  and meetingType != ''"> and meeting_type = #{meetingType}</if>
+            <if test="meetingTime != null "> and meeting_time = #{meetingTime}</if>
+            <if test="meetingVenue != null  and meetingVenue != ''"> and meeting_venue = #{meetingVenue}</if>
+            <if test="host != null  and host != ''"> and host = #{host}</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="attendees != null  and attendees != ''"> and attendees = #{attendees}</if>
+            <if test="mainTopics != null  and mainTopics != ''"> and main_topics = #{mainTopics}</if>
+            <if test="resolutionsFormed != null  and resolutionsFormed != ''"> and resolutions_formed = #{resolutionsFormed}</if>
+            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            and del_flag = 0
+        </where>
+        order by meeting_time desc
+    </select>
+    
+    <select id="selectTBranchMeetingMgrByMeetingId" parameterType="Long" resultMap="TBranchMeetingMgrResult">
+        <include refid="selectTBranchMeetingMgrVo"/>
+        where meeting_id = #{meetingId}
+    </select>
+        
+    <insert id="insertTBranchMeetingMgr" parameterType="TBranchMeetingMgr">
+        <selectKey keyProperty="meetingId" resultType="long" order="BEFORE">
+            SELECT seq_t_branch_meeting_mgr.NEXTVAL as meetingId FROM DUAL
+        </selectKey>
+        insert into t_branch_meeting_mgr
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="meetingId != null">meeting_id,</if>
+            <if test="meetingType != null">meeting_type,</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="absentees != null">absentees,</if>
+            <if test="attendees != null">attendees,</if>
+            <if test="mainTopics != null">main_topics,</if>
+            <if test="resolutionsFormed != null">resolutions_formed,</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="meetingId != null">#{meetingId},</if>
+            <if test="meetingType != null">#{meetingType},</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="absentees != null">#{absentees},</if>
+            <if test="attendees != null">#{attendees},</if>
+            <if test="mainTopics != null">#{mainTopics},</if>
+            <if test="resolutionsFormed != null">#{resolutionsFormed},</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="updateTBranchMeetingMgr" parameterType="TBranchMeetingMgr">
+        update t_branch_meeting_mgr
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="meetingType != null">meeting_type = #{meetingType},</if>
+            <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="absentees != null">absentees = #{absentees},</if>
+            <if test="attendees != null">attendees = #{attendees},</if>
+            <if test="mainTopics != null">main_topics = #{mainTopics},</if>
+            <if test="resolutionsFormed != null">resolutions_formed = #{resolutionsFormed},</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 meeting_id = #{meetingId}
+    </update>
+
+    <delete id="deleteTBranchMeetingMgrByMeetingId" parameterType="Long">
+        update t_branch_meeting_mgr set del_flag = 2 where meeting_id = #{meetingId}
+    </delete>
+
+    <delete id="deleteTBranchMeetingMgrByMeetingIds" parameterType="String">
+        update t_branch_meeting_mgr set del_flag = 2 where meeting_id in
+        <foreach item="meetingId" collection="array" open="(" separator="," close=")">
+            #{meetingId}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询支部会议管理列表
+export function listMgr(query) {
+  return request({
+    url: '/system/mgr/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询支部会议管理详细
+export function getMgr(meetingId) {
+  return request({
+    url: '/system/mgr/' + meetingId,
+    method: 'get'
+  })
+}
+
+// 新增支部会议管理
+export function addMgr(data) {
+  return request({
+    url: '/system/mgr',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改支部会议管理
+export function updateMgr(data) {
+  return request({
+    url: '/system/mgr',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除支部会议管理
+export function delMgr(meetingId) {
+  return request({
+    url: '/system/mgr/' + meetingId,
+    method: 'delete'
+  })
+}

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

@@ -0,0 +1,412 @@
+<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="meetingType">
+        <el-input
+          v-model="queryParams.meetingType"
+          placeholder="请输入会议类型"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="时间" prop="meetingTime">
+        <el-date-picker clearable
+          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="host">
+        <el-input
+          v-model="queryParams.host"
+          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="attendees">
+        <el-input
+          v-model="queryParams.attendees"
+          placeholder="请输入列席人员"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="主要议题" prop="mainTopics">
+        <el-input
+          v-model="queryParams.mainTopics"
+          placeholder="请输入主要议题"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="形成决议" prop="resolutionsFormed">
+        <el-input
+          v-model="queryParams.resolutionsFormed"
+          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="['system:mgr: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="['system:mgr: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="['system:mgr:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['system:mgr:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="mgrList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="会议类型" align="center" prop="meetingType">
+      </el-table-column>
+      <el-table-column label="时间" align="center" prop="meetingTime" width="120">
+        <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">
+      </el-table-column>
+      <el-table-column label="主持人" align="center" prop="host">
+      </el-table-column>
+      <el-table-column label="记录人" align="center" prop="recorder">
+      </el-table-column>
+      <el-table-column label="参加人员" align="center" prop="participants">
+      </el-table-column>
+      <el-table-column label="缺席人员" align="center" prop="absentees">
+      </el-table-column>
+      <el-table-column label="列席人员" align="center" prop="attendees">
+      </el-table-column>
+      <el-table-column label="主要议题" align="center" prop="mainTopics">
+      </el-table-column>
+      <el-table-column label="形成决议" align="center" prop="resolutionsFormed">
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="remarks">
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:mgr:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:mgr: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="meetingType">
+          <el-input v-model="form.meetingType" placeholder="请输入会议类型" />
+        </el-form-item>
+        <el-form-item label="时间" prop="meetingTime">
+          <el-date-picker clearable
+            v-model="form.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="form.meetingVenue" placeholder="请输入地点" />
+        </el-form-item>
+        <el-form-item label="主持人" prop="host">
+          <el-input v-model="form.host" 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="attendees">
+          <el-input v-model="form.attendees" placeholder="请输入列席人员" />
+        </el-form-item>
+        <el-form-item label="主要议题" prop="mainTopics">
+          <el-input v-model="form.mainTopics" placeholder="请输入主要议题" />
+        </el-form-item>
+        <el-form-item label="形成决议" prop="resolutionsFormed">
+          <el-input v-model="form.resolutionsFormed" placeholder="请输入形成决议" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remarks">
+          <el-input v-model="form.remarks" 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>
+  </div>
+</template>
+
+<script>
+import { listMgr, getMgr, delMgr, addMgr, updateMgr } from "@/api/branch/meeting";
+
+export default {
+  name: "Mgr",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 支部会议管理表格数据
+      mgrList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        meetingId: null,
+        meetingType: null,
+        meetingTime: null,
+        meetingVenue: null,
+        host: null,
+        recorder: null,
+        participants: null,
+        absentees: null,
+        attendees: null,
+        mainTopics: null,
+        resolutionsFormed: null,
+        remarks: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        meetingId: [
+          { required: true, message: "$comment不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询支部会议管理列表 */
+    getList() {
+      this.loading = true;
+      listMgr(this.queryParams).then(response => {
+        this.mgrList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        meetingId: null,
+        meetingType: null,
+        meetingTime: null,
+        meetingVenue: null,
+        host: null,
+        recorder: null,
+        participants: null,
+        absentees: null,
+        attendees: null,
+        mainTopics: null,
+        resolutionsFormed: 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.meetingId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加支部会议管理";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const meetingId = row.meetingId || this.ids
+      getMgr(meetingId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改支部会议管理";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.meetingId != null) {
+            updateMgr(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addMgr(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const meetingIds = row.meetingId || this.ids;
+      this.$modal.confirm('是否确认删除支部会议管理编号为"' + meetingIds + '"的数据项？').then(function() {
+        return delMgr(meetingIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('system/mgr/export', {
+        ...this.queryParams
+      }, `mgr_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>