|  | @@ -2268,23 +2268,23 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 | 
											
												
													
														|  |          musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroupId, event, sysUser.getId(), ""));
 |  |          musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroupId, event, sysUser.getId(), ""));
 | 
											
												
													
														|  |          musicGroup.setStatus(MusicGroupStatusEnum.PREPARE);
 |  |          musicGroup.setStatus(MusicGroupStatusEnum.PREPARE);
 | 
											
												
													
														|  |          musicGroupDao.update(musicGroup);
 |  |          musicGroupDao.update(musicGroup);
 | 
											
												
													
														|  | -        if (musicGroup.getOwnershipType() != null && musicGroup.getOwnershipType() == CooperationOrgan.OwnershipType.OWN) {
 |  | 
 | 
											
												
													
														|  | -            //给家长发送乐团基础训练课短信
 |  | 
 | 
											
												
													
														|  | -            //获取所有乐团学员列表
 |  | 
 | 
											
												
													
														|  | -            List<StudentRegistration> students = studentRegistrationDao.queryStudentByMusicGroupId(musicGroupId);
 |  | 
 | 
											
												
													
														|  | -            if (students != null && students.size() > 0) {
 |  | 
 | 
											
												
													
														|  | -                // 获取所有家长电话
 |  | 
 | 
											
												
													
														|  | -                Set<String> parentsPhones = students.stream().map(StudentRegistration::getParentsPhone).collect(Collectors.toSet());
 |  | 
 | 
											
												
													
														|  | -                // 获取对应家长的用户编号
 |  | 
 | 
											
												
													
														|  | -                Map<Integer, String> userIds = MapUtil.convertMybatisMap(studentRegistrationDao.findParentId(StringUtils.join(parentsPhones, ",")));
 |  | 
 | 
											
												
													
														|  | -                userIds = JSONObject.parseObject(JSONObject.toJSONString(userIds), HashMap.class);
 |  | 
 | 
											
												
													
														|  | -                if (userIds != null && userIds.size() > 0) {
 |  | 
 | 
											
												
													
														|  | -                    String studentApplyUrl = sysConfigDao.findConfigValue(SysConfigService.STUDENT_APPLY_URL) + musicGroupId;
 |  | 
 | 
											
												
													
														|  | -                    String serverPhone = sysConfigDao.findConfigValue(SysConfigService.SERVER_PHONE);
 |  | 
 | 
											
												
													
														|  | -                    sysMessageService.batchSendMessage(MessageSender.YIMEI, MessageTypeEnum.SMS_BASICS_SKILL_APPLY_MESSAGE, userIds, null, 0, "", "", musicGroup.getName(), studentApplyUrl, serverPhone);
 |  | 
 | 
											
												
													
														|  | -                }
 |  | 
 | 
											
												
													
														|  | -            }
 |  | 
 | 
											
												
													
														|  | -        }
 |  | 
 | 
											
												
													
														|  | 
 |  | +//        if (musicGroup.getOwnershipType() != null && musicGroup.getOwnershipType() == CooperationOrgan.OwnershipType.OWN) {
 | 
											
												
													
														|  | 
 |  | +//            //给家长发送乐团基础训练课短信
 | 
											
												
													
														|  | 
 |  | +//            //获取所有乐团学员列表
 | 
											
												
													
														|  | 
 |  | +//            List<StudentRegistration> students = studentRegistrationDao.queryStudentByMusicGroupId(musicGroupId);
 | 
											
												
													
														|  | 
 |  | +//            if (students != null && students.size() > 0) {
 | 
											
												
													
														|  | 
 |  | +//                // 获取所有家长电话
 | 
											
												
													
														|  | 
 |  | +//                Set<String> parentsPhones = students.stream().map(StudentRegistration::getParentsPhone).collect(Collectors.toSet());
 | 
											
												
													
														|  | 
 |  | +//                // 获取对应家长的用户编号
 | 
											
												
													
														|  | 
 |  | +//                Map<Integer, String> userIds = MapUtil.convertMybatisMap(studentRegistrationDao.findParentId(StringUtils.join(parentsPhones, ",")));
 | 
											
												
													
														|  | 
 |  | +//                userIds = JSONObject.parseObject(JSONObject.toJSONString(userIds), HashMap.class);
 | 
											
												
													
														|  | 
 |  | +//                if (userIds != null && userIds.size() > 0) {
 | 
											
												
													
														|  | 
 |  | +//                    String studentApplyUrl = sysConfigDao.findConfigValue(SysConfigService.STUDENT_APPLY_URL) + musicGroupId;
 | 
											
												
													
														|  | 
 |  | +//                    String serverPhone = sysConfigDao.findConfigValue(SysConfigService.SERVER_PHONE);
 | 
											
												
													
														|  | 
 |  | +//                    sysMessageService.batchSendMessage(MessageSender.YIMEI, MessageTypeEnum.SMS_BASICS_SKILL_APPLY_MESSAGE, userIds, null, 0, "", "", musicGroup.getName(), studentApplyUrl, serverPhone);
 | 
											
												
													
														|  | 
 |  | +//                }
 | 
											
												
													
														|  | 
 |  | +//            }
 | 
											
												
													
														|  | 
 |  | +//        }
 | 
											
												
													
														|  |          Set<Integer> roleIds = new HashSet<>(1);
 |  |          Set<Integer> roleIds = new HashSet<>(1);
 | 
											
												
													
														|  |          roleIds.add(SysUserRole.SECTION_MANAGER);
 |  |          roleIds.add(SysUserRole.SECTION_MANAGER);
 | 
											
												
													
														|  |          sysMessageService.batchSeoMessage(musicGroupDao.queryUserIdByRoleId(roleIds, musicGroup.getOrganId()), MessageTypeEnum.BACKSTAGE_MUSIC_GROUP_MARKING, "", musicGroup.getName());
 |  |          sysMessageService.batchSeoMessage(musicGroupDao.queryUserIdByRoleId(roleIds, musicGroup.getOrganId()), MessageTypeEnum.BACKSTAGE_MUSIC_GROUP_MARKING, "", musicGroup.getName());
 |