Merge remote-tracking branch 'origin/master'

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

@@ -117,10 +117,10 @@ public interface ClassGroupDao extends BaseDAO<Integer, ClassGroup> {
     /**
      * 获取课程下的学员列表
      *
-     * @param musicGroupId
+     * @param classGroupId
      * @return
      */
-    List<ImUserModel> findGroupUsers(String musicGroupId);
+    List<ImUserModel> findGroupUsers(Integer classGroupId);
 
     /**
      * count学员购买列表

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

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

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

@@ -512,14 +512,13 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 Integer num = numsMap.get(e.getId());
                 e.setCount(num == null ? 0 : num + e.getCount());
             });
-//            imGroupModels.addAll(imGroupModels1);
         }
         return imGroupModels;
     }
 
     @Override
-    public List<ImUserModel> findGroupUsers(String groupId) {
-        return classGroupDao.findGroupUsers(groupId.substring(2));
+    public List<ImUserModel> findGroupUsers(Integer groupId) {
+        return classGroupDao.findGroupUsers(groupId);
     }
 
     @Override

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

@@ -83,6 +83,9 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
     private OrganizationDao organizationDao;
 
     @Autowired
+    private SysConfigDao sysConfigDao;
+
+    @Autowired
     private CourseScheduleTeacherSalaryDao courseScheduleTeacherSalaryDao;
 
     @Autowired
@@ -711,7 +714,10 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         musicGroupDao.update(musicGroup);
         //给家长发送乐团基础训练课短信
         //获取所有乐团学员列表
-        List<StudentRegistration> students = studentRegistrationService.queryStudentByMusicGroupId(musicGroupId);
-//        sysMessageService.sendMessage(MessageSender.YIMEI,);
+//        List<StudentRegistration> students = studentRegistrationService.queryStudentByMusicGroupId(musicGroupId);
+        //获取所有家长电话
+//        Set<String> parentsPhones = students.stream().map(StudentRegistration::getParentsPhone).collect(Collectors.toSet());
+//        String content = sysConfigDao.findConfigValue(MessageTypeEnum.SMS_BASICS_SKILL_APPLY_MESSAGE.getCode());
+//        sysMessageService.batchSendMessage(MessageSender.YIMEI,"",content,);
     }
 }

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

@@ -264,7 +264,7 @@
     <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_ = #{musicGroupId} GROUP BY su.id_
+        WHERE cgsm.class_group_id_ = #{classGroupId} GROUP BY su.id_
     </select>
     <select id="countStudentPayLog" resultType="java.lang.Integer">
         SELECT COUNT(spo.id_)

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

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

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

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