Merge remote-tracking branch 'origin/main'

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

@@ -78,4 +78,15 @@ public class MeetingTypeController {
 
         return R.ok(list);
     }
+
+    /**
+     * 获取会议类型下拉框
+     */
+    @GetMapping("/select")
+    public R select() {
+
+        List<MeetTypeDto> list =  meetTypeService.getMeetTypeSelect();
+
+        return R.ok(list);
+    }
 }

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

@@ -30,6 +30,13 @@ public interface MeetTypeMapper extends BaseMapper<MeetType> {
      * @return
      */
     List<MeetTypeDto> selectCustomMeetTypeList(@Param("userId") String userId);
+
+    /**
+     * 查询会议类型下拉框
+     * @return
+     */
+    List<MeetTypeDto> selectMeetTypeSelect();
+
 }
 
 

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

@@ -51,4 +51,10 @@ public interface MeetTypeService extends IService<MeetType> {
      */
     List<MeetTypeDto> getCustomMeetTypeList();
 
+    /**
+     * 获取会议类型下拉框
+     * @return
+     */
+    List<MeetTypeDto> getMeetTypeSelect();
+
 }

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

@@ -21,6 +21,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
@@ -169,6 +170,16 @@ public class MeetTypeServiceImpl extends ServiceImpl<MeetTypeMapper, MeetType>
         return meetTypeDtoList;
     }
 
+    /**
+     * 获取会议类型下拉列表
+     *
+     * @return
+     */
+    @Override
+    public List<MeetTypeDto> getMeetTypeSelect() {
+        return meetTypeMapper.selectMeetTypeSelect();
+    }
+
 
 }
 

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

@@ -91,4 +91,15 @@
             meet_type.is_del = 0
           and cmt_meeting_record_template.`type` = 'custom'
     </select>
+
+    <!-- 查询会议类型下拉框 -->
+    <select id="selectMeetTypeSelect" resultMap="MeetTypeDtoResultMap">
+        select
+            name as meeting_type_name,
+            content as meeting_type_content
+        from
+            meet_type
+        where
+            is_del = 0
+    </select>
 </mapper>