群组新增搜索功能

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/ClassGroupDao.java

@@ -157,7 +157,7 @@ public interface ClassGroupDao extends BaseDAO<Integer, ClassGroup> {
      * @param classGroupId
      * @return
      */
-    List<ImUserModel> findGroupUsers(Integer classGroupId);
+    List<ImUserModel> findGroupUsers(@Param("classGroupId") Integer classGroupId, @Param("search") String search);
 
     /**
      * count学员购买列表

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/TeacherDao.java

@@ -336,7 +336,7 @@ public interface TeacherDao extends BaseDAO<Integer, Teacher> {
      * @param teacherIds
      * @return
      */
-    List<ImUserModel> queryTeacherImModel(@Param("teacherIds") Set<Integer> teacherIds);
+    List<ImUserModel> queryTeacherImModel(@Param("teacherIds") Set<Integer> teacherIds, @Param("search") String search);
 
     /**
      * 获取和学员相关的乐团老师列表

mec-biz/src/main/java/com/ym/mec/biz/service/ClassGroupService.java

@@ -151,7 +151,7 @@ public interface ClassGroupService extends BaseService<Integer, ClassGroup> {
      * @param groupId
      * @return
      */
-    List<ImUserModel> findGroupUsers(Integer groupId);
+    List<ImUserModel> findGroupUsers(Integer groupId,String search);
 
     /**
      * 分页查询学生购买记录

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ClassGroupServiceImpl.java

@@ -716,16 +716,16 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         imGroupModels.addAll(classGroupDao.queryUserCommGroups(userId, search));
         if (imGroupModels != null && imGroupModels.size() > 0) {
             imGroupModels.forEach(e -> {
-                e.setCount(classGroupService.findGroupUsers(Integer.parseInt(e.getId())).size());
+                e.setCount(classGroupService.findGroupUsers(Integer.parseInt(e.getId()),null).size());
             });
         }
         return imGroupModels;
     }
 
     @Override
-    public List<ImUserModel> findGroupUsers(Integer groupId) {
+    public List<ImUserModel> findGroupUsers(Integer groupId,String search) {
         //获取相关学员
-        List<ImUserModel> students = classGroupDao.findGroupUsers(groupId);
+        List<ImUserModel> students = classGroupDao.findGroupUsers(groupId,search);
         if (students == null) {
             students = new ArrayList<>();
         }
@@ -762,7 +762,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         }
         teacherIds.removeAll(Collections.singleton(null));
         if(teacherIds.size() > 0){
-            List<ImUserModel> userModels = teacherDao.queryTeacherImModel(teacherIds);
+            List<ImUserModel> userModels = teacherDao.queryTeacherImModel(teacherIds,search);
             for (ImUserModel e : userModels) {
                 if(musicGroup != null){
                     if(musicGroup.getTeamTeacherId() != null && Integer.parseInt(e.getId()) == musicGroup.getTeamTeacherId()){

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TeacherServiceImpl.java

@@ -144,7 +144,7 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 		List<ImGroupModel> imGroupModels =  classGroupDao.queryTeacherGroups(userId,search);
 		if(imGroupModels != null && imGroupModels.size() > 0){
 			imGroupModels.forEach(e -> {
-				e.setCount(classGroupService.findGroupUsers(Integer.parseInt(e.getId())).size());
+				e.setCount(classGroupService.findGroupUsers(Integer.parseInt(e.getId()),null).size());
 			});
 		}
 		return imGroupModels;

mec-biz/src/main/resources/config/mybatis/ClassGroupMapper.xml

@@ -348,7 +348,11 @@
     <select id="findGroupUsers" resultMap="com.ym.mec.biz.dal.dao.MusicGroupDao.ImUserModel">
         SELECT su.id_,su.avatar_,su.username_ FROM class_group_student_mapper cgsm
         LEFT JOIN sys_user su ON cgsm.user_id_ = su.id_
-        WHERE cgsm.class_group_id_ = #{classGroupId} AND cgsm.status_ != 'QUIT' GROUP BY su.id_
+        WHERE cgsm.class_group_id_ = #{classGroupId} AND cgsm.status_ != 'QUIT'
+        <if test="search != null and search != ''">
+            AND su.username_ LIKE CONCAT('%',#{search},'%')
+        </if>
+        GROUP BY su.id_
     </select>
     <select id="findGroupTeacher" resultType="java.lang.Integer">
         SELECT cgtm.user_id_ FROM class_group_teacher_mapper cgtm

mec-biz/src/main/resources/config/mybatis/TeacherMapper.xml

@@ -827,6 +827,9 @@
         <foreach collection="teacherIds" item="userId" open="(" close=")" separator=",">
             #{userId}
         </foreach>
+        <if test="search != null and search != ''">
+            AND su.real_name_ LIKE CONCAT('%',#{search},'%')
+        </if>
     </select>
     <select id="findMusicTeacherIds" resultType="java.lang.Integer">
         SELECT DISTINCT cgtm.user_id_ FROM class_group_student_mapper cgsm

mec-student/src/main/java/com/ym/mec/student/controller/StudentManageController.java

@@ -78,11 +78,11 @@ public class StudentManageController extends BaseController {
 
     @ApiOperation(value = "根据群编号，获取群组所有成员基本信息")
     @GetMapping("classGroup/findGroupUsers")
-    public Object findGroupUsers(Integer groupId) {
+    public Object findGroupUsers(Integer groupId,String search) {
         if (groupId == null) {
             return failed("参数校验错误");
         }
-        return succeed(classGroupService.findGroupUsers(groupId));
+        return succeed(classGroupService.findGroupUsers(groupId,search));
     }
 
     @ApiOperation(value = "分页查询群公告列表")

mec-teacher/src/main/java/com/ym/mec/teacher/controller/TeacherManageController.java

@@ -89,11 +89,11 @@ public class TeacherManageController extends BaseController {
 
     @ApiOperation(value = "根据群编号，获取群组所有成员基本信息")
     @GetMapping("classGroup/findGroupUsers")
-    public Object findGroupUsers(Integer groupId) {
+    public Object findGroupUsers(Integer groupId,String search) {
         if (groupId == null) {
             return failed("参数校验错误");
         }
-        return succeed(classGroupService.findGroupUsers(groupId));
+        return succeed(classGroupService.findGroupUsers(groupId,search));
     }
 
     @ApiOperation(value = "获取用户账户信息")

mec-web/src/main/java/com/ym/mec/web/controller/education/ImController.java

@@ -74,11 +74,11 @@ public class ImController extends BaseController {
     @ApiOperation(value = "根据群编号，获取群组所有成员基本信息")
     @GetMapping("/findGroupUsers")
     @PreAuthorize("@pcs.hasPermissions('im/findGroupUsers','system')")
-    public Object findGroupUsers(Integer groupId) {
+    public Object findGroupUsers(Integer groupId,String search) {
         if (groupId == null) {
             return failed("参数校验错误");
         }
-        return succeed(classGroupService.findGroupUsers(groupId));
+        return succeed(classGroupService.findGroupUsers(groupId,search));
     }
 
     @ApiOperation(value = "根据群编号，获取用户群名片")