支部会议管理表改表名

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

@@ -3,8 +3,8 @@ 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 com.ruoyi.branch.domain.TBranchMeeting;
+import com.ruoyi.branch.service.ITBranchMeetingService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -30,20 +30,20 @@ import com.ruoyi.common.core.page.TableDataInfo;
  */
 @RestController
 @RequestMapping("/branch/meeting")
-public class TBranchMeetingMgrController extends BaseController
+public class TBranchMeetingController extends BaseController
 {
     @Autowired
-    private ITBranchMeetingMgrService tBranchMeetingMgrService;
+    private ITBranchMeetingService tBranchMeetingMgrService;
 
     /**
      * 查询支部会议管理列表
      */
     @PreAuthorize("@ss.hasPermi('branch:meeting:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TBranchMeetingMgr tBranchMeetingMgr)
+    public TableDataInfo list(TBranchMeeting tBranchMeeting)
     {
         startPage();
-        List<TBranchMeetingMgr> list = tBranchMeetingMgrService.selectTBranchMeetingMgrList(tBranchMeetingMgr);
+        List<TBranchMeeting> list = tBranchMeetingMgrService.selectTBranchMeetingMgrList(tBranchMeeting);
         return getDataTable(list);
     }
 
@@ -53,10 +53,10 @@ public class TBranchMeetingMgrController extends BaseController
     @PreAuthorize("@ss.hasPermi('branch:meeting:export')")
     @Log(title = "支部会议管理", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, TBranchMeetingMgr tBranchMeetingMgr)
+    public void export(HttpServletResponse response, TBranchMeeting tBranchMeeting)
     {
-        List<TBranchMeetingMgr> list = tBranchMeetingMgrService.selectTBranchMeetingMgrList(tBranchMeetingMgr);
-        ExcelUtil<TBranchMeetingMgr> util = new ExcelUtil<TBranchMeetingMgr>(TBranchMeetingMgr.class);
+        List<TBranchMeeting> list = tBranchMeetingMgrService.selectTBranchMeetingMgrList(tBranchMeeting);
+        ExcelUtil<TBranchMeeting> util = new ExcelUtil<TBranchMeeting>(TBranchMeeting.class);
         util.exportExcel(response, list, "支部会议管理数据");
     }
 
@@ -76,9 +76,9 @@ public class TBranchMeetingMgrController extends BaseController
     @PreAuthorize("@ss.hasPermi('branch:meeting:add')")
     @Log(title = "支部会议管理", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody TBranchMeetingMgr tBranchMeetingMgr)
+    public AjaxResult add(@RequestBody TBranchMeeting tBranchMeeting)
     {
-        return toAjax(tBranchMeetingMgrService.insertTBranchMeetingMgr(tBranchMeetingMgr));
+        return toAjax(tBranchMeetingMgrService.insertTBranchMeetingMgr(tBranchMeeting));
     }
 
     /**
@@ -87,9 +87,9 @@ public class TBranchMeetingMgrController extends BaseController
     @PreAuthorize("@ss.hasPermi('branch:meeting:edit')")
     @Log(title = "支部会议管理", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody TBranchMeetingMgr tBranchMeetingMgr)
+    public AjaxResult edit(@RequestBody TBranchMeeting tBranchMeeting)
     {
-        return toAjax(tBranchMeetingMgrService.updateTBranchMeetingMgr(tBranchMeetingMgr));
+        return toAjax(tBranchMeetingMgrService.updateTBranchMeetingMgr(tBranchMeeting));
     }
 
     /**

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

@@ -13,7 +13,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * @author ruoyi
  * @date 2023-06-07
  */
-public class TBranchMeetingMgr extends BaseEntity
+public class TBranchMeeting extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 

ruoyi-system/src/main/java/com/ruoyi/branch/mapper/TBranchMeetingMgrMapper.java → ruoyi-system/src/main/java/com/ruoyi/branch/mapper/TBranchMeetingMapper.java

@@ -1,6 +1,6 @@
 package com.ruoyi.branch.mapper;
 
-import com.ruoyi.branch.domain.TBranchMeetingMgr;
+import com.ruoyi.branch.domain.TBranchMeeting;
 
 import java.util.List;
 
@@ -10,7 +10,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2023-06-07
  */
-public interface TBranchMeetingMgrMapper 
+public interface TBranchMeetingMapper
 {
     /**
      * 查询支部会议管理
@@ -18,31 +18,31 @@ public interface TBranchMeetingMgrMapper
      * @param meetingId 支部会议管理主键
      * @return 支部会议管理
      */
-    public TBranchMeetingMgr selectTBranchMeetingMgrByMeetingId(Long meetingId);
+    public TBranchMeeting selectTBranchMeetingMgrByMeetingId(Long meetingId);
 
     /**
      * 查询支部会议管理列表
      * 
-     * @param tBranchMeetingMgr 支部会议管理
+     * @param tBranchMeeting 支部会议管理
      * @return 支部会议管理集合
      */
-    public List<TBranchMeetingMgr> selectTBranchMeetingMgrList(TBranchMeetingMgr tBranchMeetingMgr);
+    public List<TBranchMeeting> selectTBranchMeetingMgrList(TBranchMeeting tBranchMeeting);
 
     /**
      * 新增支部会议管理
      * 
-     * @param tBranchMeetingMgr 支部会议管理
+     * @param tBranchMeeting 支部会议管理
      * @return 结果
      */
-    public int insertTBranchMeetingMgr(TBranchMeetingMgr tBranchMeetingMgr);
+    public int insertTBranchMeetingMgr(TBranchMeeting tBranchMeeting);
 
     /**
      * 修改支部会议管理
      * 
-     * @param tBranchMeetingMgr 支部会议管理
+     * @param tBranchMeeting 支部会议管理
      * @return 结果
      */
-    public int updateTBranchMeetingMgr(TBranchMeetingMgr tBranchMeetingMgr);
+    public int updateTBranchMeetingMgr(TBranchMeeting tBranchMeeting);
 
     /**
      * 删除支部会议管理

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

@@ -1,6 +1,6 @@
 package com.ruoyi.branch.service;
 
-import com.ruoyi.branch.domain.TBranchMeetingMgr;
+import com.ruoyi.branch.domain.TBranchMeeting;
 
 import java.util.List;
 
@@ -10,7 +10,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2023-06-07
  */
-public interface ITBranchMeetingMgrService 
+public interface ITBranchMeetingService
 {
     /**
      * 查询支部会议管理
@@ -18,31 +18,31 @@ public interface ITBranchMeetingMgrService
      * @param meetingId 支部会议管理主键
      * @return 支部会议管理
      */
-    public TBranchMeetingMgr selectTBranchMeetingMgrByMeetingId(Long meetingId);
+    public TBranchMeeting selectTBranchMeetingMgrByMeetingId(Long meetingId);
 
     /**
      * 查询支部会议管理列表
      * 
-     * @param tBranchMeetingMgr 支部会议管理
+     * @param tBranchMeeting 支部会议管理
      * @return 支部会议管理集合
      */
-    public List<TBranchMeetingMgr> selectTBranchMeetingMgrList(TBranchMeetingMgr tBranchMeetingMgr);
+    public List<TBranchMeeting> selectTBranchMeetingMgrList(TBranchMeeting tBranchMeeting);
 
     /**
      * 新增支部会议管理
      * 
-     * @param tBranchMeetingMgr 支部会议管理
+     * @param tBranchMeeting 支部会议管理
      * @return 结果
      */
-    public int insertTBranchMeetingMgr(TBranchMeetingMgr tBranchMeetingMgr);
+    public int insertTBranchMeetingMgr(TBranchMeeting tBranchMeeting);
 
     /**
      * 修改支部会议管理
      * 
-     * @param tBranchMeetingMgr 支部会议管理
+     * @param tBranchMeeting 支部会议管理
      * @return 结果
      */
-    public int updateTBranchMeetingMgr(TBranchMeetingMgr tBranchMeetingMgr);
+    public int updateTBranchMeetingMgr(TBranchMeeting tBranchMeeting);
 
     /**
      * 批量删除支部会议管理

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

@@ -1,99 +0,0 @@
-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.annotation.DataScope;
-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
-    @DataScope(deptAlias = "d", userAlias = "u")
-    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/java/com/ruoyi/branch/service/impl/TBranchMeetingServiceImpl.java

@@ -0,0 +1,99 @@
+package com.ruoyi.branch.service.impl;
+
+import java.util.List;
+
+import com.ruoyi.branch.domain.TBranchMeeting;
+import com.ruoyi.branch.mapper.TBranchMeetingMapper;
+import com.ruoyi.branch.service.ITBranchMeetingService;
+import com.ruoyi.common.annotation.DataScope;
+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 TBranchMeetingServiceImpl implements ITBranchMeetingService
+{
+    @Autowired
+    private TBranchMeetingMapper tBranchMeetingMapper;
+
+    /**
+     * 查询支部会议管理
+     * 
+     * @param meetingId 支部会议管理主键
+     * @return 支部会议管理
+     */
+    @Override
+    public TBranchMeeting selectTBranchMeetingMgrByMeetingId(Long meetingId)
+    {
+        return tBranchMeetingMapper.selectTBranchMeetingMgrByMeetingId(meetingId);
+    }
+
+    /**
+     * 查询支部会议管理列表
+     * 
+     * @param tBranchMeeting 支部会议管理
+     * @return 支部会议管理
+     */
+    @Override
+    @DataScope(deptAlias = "d", userAlias = "u")
+    public List<TBranchMeeting> selectTBranchMeetingMgrList(TBranchMeeting tBranchMeeting)
+    {
+        return tBranchMeetingMapper.selectTBranchMeetingMgrList(tBranchMeeting);
+    }
+
+    /**
+     * 新增支部会议管理
+     * 
+     * @param tBranchMeeting 支部会议管理
+     * @return 结果
+     */
+    @Override
+    public int insertTBranchMeetingMgr(TBranchMeeting tBranchMeeting)
+    {
+        tBranchMeeting.setCreateTime(DateUtils.getNowDate());
+        return tBranchMeetingMapper.insertTBranchMeetingMgr(tBranchMeeting);
+    }
+
+    /**
+     * 修改支部会议管理
+     * 
+     * @param tBranchMeeting 支部会议管理
+     * @return 结果
+     */
+    @Override
+    public int updateTBranchMeetingMgr(TBranchMeeting tBranchMeeting)
+    {
+        tBranchMeeting.setUpdateTime(DateUtils.getNowDate());
+        return tBranchMeetingMapper.updateTBranchMeetingMgr(tBranchMeeting);
+    }
+
+    /**
+     * 批量删除支部会议管理
+     * 
+     * @param meetingIds 需要删除的支部会议管理主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTBranchMeetingMgrByMeetingIds(Long[] meetingIds)
+    {
+        return tBranchMeetingMapper.deleteTBranchMeetingMgrByMeetingIds(meetingIds);
+    }
+
+    /**
+     * 删除支部会议管理信息
+     * 
+     * @param meetingId 支部会议管理主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTBranchMeetingMgrByMeetingId(Long meetingId)
+    {
+        return tBranchMeetingMapper.deleteTBranchMeetingMgrByMeetingId(meetingId);
+    }
+}

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

@@ -2,9 +2,9 @@
 <!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">
+<mapper namespace="com.ruoyi.branch.mapper.TBranchMeetingMapper">
     
-    <resultMap type="TBranchMeetingMgr" id="TBranchMeetingMgrResult">
+    <resultMap type="TBranchMeeting" id="TBranchMeetingMgrResult">
         <result property="meetingId"    column="meeting_id"    />
         <result property="meetingType"    column="meeting_type"    />
         <result property="meetingTime"    column="meeting_time"    />
@@ -45,11 +45,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             u.update_by,
             u.update_time,
             u.dept_id
-        from t_branch_meeting_mgr u
+        from T_BRANCH_MEETING u
         left join sys_dept d on u.dept_id = d.dept_id
     </sql>
 
-    <select id="selectTBranchMeetingMgrList" parameterType="TBranchMeetingMgr" resultMap="TBranchMeetingMgrResult">
+    <select id="selectTBranchMeetingMgrList" parameterType="TBranchMeeting" resultMap="TBranchMeetingMgrResult">
         <include refid="selectTBranchMeetingMgrVo"/>
         <where>  
             <if test="meetingId != null "> and u.meeting_id = #{meetingId}</if>
@@ -80,11 +80,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         and u.del_flag = 0
     </select>
         
-    <insert id="insertTBranchMeetingMgr" parameterType="TBranchMeetingMgr">
+    <insert id="insertTBranchMeetingMgr" parameterType="TBranchMeeting">
         <selectKey keyProperty="meetingId" resultType="long" order="BEFORE">
-            SELECT seq_t_branch_meeting_mgr.NEXTVAL as meetingId FROM DUAL
+            SELECT seq_t_branch_meeting.NEXTVAL as meetingId FROM DUAL
         </selectKey>
-        insert into t_branch_meeting_mgr
+        insert into t_branch_meeting
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="meetingId != null">meeting_id,</if>
             <if test="meetingType != null">meeting_type,</if>
@@ -127,8 +127,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-    <update id="updateTBranchMeetingMgr" parameterType="TBranchMeetingMgr">
-        update t_branch_meeting_mgr
+    <update id="updateTBranchMeetingMgr" parameterType="TBranchMeeting">
+        update T_BRANCH_MEETING
         <trim prefix="SET" suffixOverrides=",">
             <if test="meetingType != null">meeting_type = #{meetingType},</if>
             <if test="meetingTime != null">meeting_time = #{meetingTime},</if>
@@ -152,11 +152,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteTBranchMeetingMgrByMeetingId" parameterType="Long">
-        update t_branch_meeting_mgr set del_flag = 2 where meeting_id = #{meetingId}
+        update T_BRANCH_MEETING 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
+        update T_BRANCH_MEETING set del_flag = 2 where meeting_id in
         <foreach item="meetingId" collection="array" open="(" separator="," close=")">
             #{meetingId}
         </foreach>