1、修改获取纪要模板列表接口，添加响应参数

src/main/java/com/cmeeting/controller/RecordTemplateController.java

@@ -8,6 +8,7 @@ import com.cmeeting.pojo.MeetingRecordTemplate;
 import com.cmeeting.service.MeetingRecordTemplateService;
 import com.cmeeting.service.RecordTemplatePermissionService;
 import com.cmeeting.util.R;
+import com.cmeeting.util.page.PageUtil;
 import com.cmeeting.vo.EditRecordTemplateVo;
 import com.cmeeting.vo.RecordTemplateVO;
 import com.deepoove.poi.XWPFTemplate;
@@ -99,8 +100,12 @@ public class RecordTemplateController {
      */
     @PostMapping("/list")
     public R list(@RequestBody RecordTemplateVO vo) {
-        IPage<MeetingRecordTemplate> page = recordTemplateService.getPage(vo);
-        return R.ok(page);
+        Integer current = vo.getCurrent();
+        Integer size = vo.getSize();
+        PageUtil.startPage(current, size, "cmt_meeting_record_template.id desc");
+
+        List<RecordTemplateDto> list = recordTemplateService.getRecordTemplateDtoList(vo);
+        return PageUtil.getDataTable(list);
     }
 
     /**

src/main/java/com/cmeeting/dto/RecordTemplateDto.java

@@ -29,4 +29,6 @@ public class RecordTemplateDto {
     // 是否启用
     private Boolean enable;
 
+    // 会议类型名称
+    private String meetingTypeName;
 }
\ No newline at end of file

src/main/java/com/cmeeting/mapper/primary/MeetingRecordTemplateMapper.java

@@ -7,6 +7,7 @@ import com.cmeeting.pojo.MeetingRecordTemplate;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 
@@ -36,6 +37,18 @@ public interface MeetingRecordTemplateMapper extends BaseMapper<MeetingRecordTem
      */
     List<MeetTypeDto> selectAllTmplWithoutPermission(String userId);
 
+    /**
+     * 获取模板
+     * @return
+     */
+    List<RecordTemplateDto> selectRecordTemplateDtoList(@Param("type") String type,
+                                                        @Param("name") String name,
+                                                        @Param("meetingType") String meetingType,
+                                                        @Param("createUser") String createUser,
+                                                        @Param("startTime") LocalDateTime startTime,
+                                                        @Param("endTime") LocalDateTime endTime);
+
+
 
     /**
      * 获取启用的模板

src/main/java/com/cmeeting/service/MeetingRecordTemplateService.java

@@ -18,7 +18,7 @@ public interface MeetingRecordTemplateService extends IService<MeetingRecordTemp
      * @param vo
      * @return
      */
-    IPage<MeetingRecordTemplate> getPage(RecordTemplateVO vo);
+    List<RecordTemplateDto> getRecordTemplateDtoList(RecordTemplateVO vo);
 
     /**
      * 普通用户查询个人模板列表

src/main/java/com/cmeeting/service/impl/MeetingRecordTemplateServiceImpl.java

@@ -58,30 +58,22 @@ public class MeetingRecordTemplateServiceImpl extends ServiceImpl<MeetingRecordT
     private String permissionTenantId;
 
     @Override
-    public IPage<MeetingRecordTemplate> getPage(RecordTemplateVO vo) {
+    public List<RecordTemplateDto> getRecordTemplateDtoList(RecordTemplateVO vo) {
         RobotSecurityUser user = SecurityUtil.getUser();
-        LambdaQueryWrapper<MeetingRecordTemplate> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(MeetingRecordTemplate::getIsDel,Boolean.FALSE);
-        queryWrapper.eq(StringUtils.isNotEmpty(vo.getType()),MeetingRecordTemplate::getType,vo.getType());
-        queryWrapper.like(StringUtils.isNotEmpty(vo.getName()),MeetingRecordTemplate::getName,vo.getName());
-        queryWrapper.like(StringUtils.isNotEmpty(vo.getMeetingType()),MeetingRecordTemplate::getMeetingType,vo.getMeetingType());
-        queryWrapper.like(StringUtils.isNotEmpty(vo.getCreateUser()),MeetingRecordTemplate::getCreateUserName,vo.getCreateUser());
-        queryWrapper.between(vo.getStartTime() != null && vo.getEndTime() != null,MeetingRecordTemplate::getUpdateTime,vo.getStartTime(),vo.getEndTime());
-        queryWrapper.orderByDesc(MeetingRecordTemplate::getId);
-        IPage<MeetingRecordTemplate> resultPage = baseMapper.selectPage(new Page<>(vo.getCurrent(), vo.getSize()), queryWrapper);
-        List<MeetingRecordTemplate> records = resultPage.getRecords();
-        if(!CollectionUtils.isEmpty(records)){
+
+        List<RecordTemplateDto> list = baseMapper.selectRecordTemplateDtoList(vo.getType(), vo.getName(), vo.getMeetingType(), vo.getCreateUser(), vo.getStartTime(), vo.getEndTime());
+
+        if(!CollectionUtils.isEmpty(list)){
             List<SysUserSync> simpleUserList = sysUserSysMapper.getSimpleUserList(user.getTenantId());
             Map<String, String> simpleUserMap = CollectionUtils.isEmpty(simpleUserList)
                     ? new HashMap<>() : simpleUserList.stream().collect(Collectors.toMap(SysUserSync::getUserId, SysUserSync::getName));
-            for (MeetingRecordTemplate record : records) {
+            for (RecordTemplateDto record : list) {
                 String createUser = record.getCreateUser();
                 String createUserName = simpleUserMap.containsKey(createUser) ? simpleUserMap.get(createUser) : "1".equals(createUser) ? "集团" : createUser;
                 record.setCreateUser(createUserName);
             }
         }
-        resultPage.setRecords(records);
-        return resultPage;
+        return list;
     }
 
     @Override

src/main/resources/mapper/primary/MeetingRecordTemplateMapper.xml

@@ -28,6 +28,20 @@
         cmt_meeting_record_template.refer_template_id AS template_refer_template_id,
         IF(meet_template_enable.id IS NULL, 0, 1) AS template_enabled
     </sql>
+
+    <resultMap id="RecordTemplateDtoResultMap" type="com.cmeeting.dto.RecordTemplateDto">
+        <id property="id" column="template_id" />
+        <result property="name" column="template_name" />
+        <result property="type" column="template_type_type" />
+        <result property="typeDetail" column="template_type_detail" />
+        <result property="createUser" column="template_create_user" />
+        <result property="createTime" column="template_create_time" />
+        <result property="enable" column="template_enabled" />
+        <result property="prompt" column="template_prompt" />
+        <result property="referTemplateId" column="template_refer_template_id" />
+        <result property="meetingTypeName" column="meeting_type_name" />
+    </resultMap>
+
     <resultMap id="MeetTypeDtoResultMap" type="com.cmeeting.dto.MeetTypeDto">
         <id property="id" column="meeting_type_id" />
         <result property="name" column="meeting_type_name" />
@@ -37,19 +51,10 @@
         <result property="content" column="meeting_type_content" />
         <result property="createUser" column="meeting_type_create_user" />
         <result property="createTime" column="meeting_type_create_time" />
-        <collection property="recordTemplateDTOList" javaType="List" ofType="com.cmeeting.dto.RecordTemplateDto">
-            <id property="id" column="template_id" />
-            <result property="name" column="template_name" />
-            <result property="type" column="template_type_type" />
-            <result property="typeDetail" column="template_type_detail" />
-            <result property="createUser" column="template_create_user" />
-            <result property="createTime" column="template_create_time" />
-            <result property="enable" column="template_enabled" />
-            <result property="prompt" column="template_prompt" />
-            <result property="referTemplateId" column="template_refer_template_id" />
-        </collection>
+        <collection property="recordTemplateDTOList" javaType="List" resultMap="RecordTemplateDtoResultMap" />
     </resultMap>
 
+
     <!-- 查询授权的模板-会议类型维度 -->
     <select id="selectPermissionTmplInMeetType" resultMap="MeetTypeDtoResultMap">
         select
@@ -173,6 +178,34 @@
     </select>
 
 
+    <select id="selectRecordTemplateDtoList" resultMap="RecordTemplateDtoResultMap">
+        select
+            cmt_meeting_record_template.id as template_id,
+            cmt_meeting_record_template.name as template_name,
+            cmt_meeting_record_template.type as template_type_type,
+            cmt_meeting_record_template.type_detail as template_type_detail,
+            cmt_meeting_record_template.prompt as template_prompt,
+            cmt_meeting_record_template.refer_template_id as template_refer_template_id,
+            cmt_meeting_record_template.create_user as template_create_user,
+            cmt_meeting_record_template.update_time as template_create_time,
+            meet_type.name as meeting_type_name
+        from
+            cmt_meeting_record_template,
+            meet_type
+        <where>
+            cmt_meeting_record_template.is_del = 0
+            and cmt_meeting_record_template.meeting_type = meet_type.id
+            <if test="name != null and name != ''">and cmt_meeting_record_template.name like concat('%', #{name}, '%')</if>
+            <if test="type != null and type != ''">and cmt_meeting_record_template.type = #{type}</if>
+            <if test="meetingType != null and meetingType != ''">and meet_type.name like concat('%', #{meetingType}, '%')</if>
+            <if test="createUser != null and createUser != ''">and (cmt_meeting_record_template.create_user like concat('%', #{createUser}, '%') or cmt_meeting_record_template.create_user_name like concat('%', #{createUser}, '%') )</if>
+            <if test="startTime != null">and cmt_meeting_record_template.update_time &gt;= date_format(#{startTime}, '%Y-%m-%d')</if>
+            <if test="endTime != null">and cmt_meeting_record_template.update_time &lt;= date_format(#{endTime}, '%Y-%m-%d')</if>
+        </where>
+    </select>
+
+
+
     <select id="selectEnabledTemplate" resultType="com.cmeeting.pojo.MeetingRecordTemplate">
         select
             cmt_meeting_record_template.*