Merge branch 'online1'

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

@@ -1790,13 +1790,6 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 
         //所有教师列表
         List<Teacher> teachers = teacherDao.findByTeacherIds(allTeacherIds);
-        Map<Integer, Teacher> teacherMap = teachers.stream()
-                .collect(Collectors.toMap(Teacher::getId, teacher -> teacher));
-
-        //创建IM群组
-        addImGroup(classGroup, userIds, teacherIds);
-
-
         Map<String, Integer> courseTypeMinutesMap = musicGroupPaymentCalenderCourseSettingsService.getMusicCourseSettingsWithStudents(musicGroupId, studentIdList);
 
         //计算每节课的课酬
@@ -1920,6 +1913,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
             courseScheduleStudentPaymentService.createForMusicGroup(musicGroupId, courseScheduleList, studentIdList);
             studentDao.updateStudentServiceTag(null, studentIdList, YesOrNoEnum.YES.getCode());
         }
+        //创建IM群组
+        addImGroup(classGroup, userIds, teacherIds);
         return classGroup;
     }
 
@@ -2974,6 +2969,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         
         imGroupService.create(classGroup.getId().longValue(), null, classGroup.getName(), musicGroup.getName(), musicGroup.getName(), musicGroup.getName(), null, "MUSIC");
         imGroupMemberService.join(classGroup.getId().longValue(), userRoleMap);
+        imUserFriendService.refreshClassImUserFriend(classGroup.getId());
         return true;
     }
 

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

@@ -234,6 +234,12 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 		List<ImGroupModel> educationGroupModels = new ArrayList<>();
 		List<ImGroupModel> teamGroupModels = new ArrayList<>();
 		List<ImGroupModel> directorGroupModels = new ArrayList<>();
+		//获取用户担任教务老师的所有乐团列表
+		List<String> musicGroupIds = employeeDao.queryMusicGroupIdByUserId(levelUserId);
+		//获取用户担任教务老师的所有网管课列表
+		List<String> practiceGroupIds = employeeDao.queryPracticeGroupIdByUserId(levelUserId);
+		//获取用户担任教务老师的所有VIP课列表
+		List<String> vipGroupIds = employeeDao.queryVipGroupIdByUserId(levelUserId);
 		//获取用户需要加入的群组列表
 		Map<String, List<EmployeeLevelDto>> collect = employeeLevelDtos.stream().collect(Collectors.groupingBy(e -> e.getRoleName()));
 		Set<String> roleNames = collect.keySet();
@@ -315,22 +321,16 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 		employeeDao.updateUserDemissionDate(levelUserId);
 		//冻结用户
 		employeeDao.updateUserLock(levelUserId,1);
-		//获取用户担任教务老师的所有乐团列表
-		List<String> musicGroupIds = employeeDao.queryMusicGroupIdByUserId(levelUserId);
 		if(musicGroupIds.size() > 0){
 			for (String musicGroupId : musicGroupIds) {
 				imUserFriendService.refreshGroupImUserFriend(musicGroupId, GroupType.MUSIC);
 			}
 		}
-		//获取用户担任教务老师的所有网管课列表
-		List<String> practiceGroupIds = employeeDao.queryPracticeGroupIdByUserId(levelUserId);
 		if(practiceGroupIds.size() > 0){
 			for (String musicGroupId : practiceGroupIds) {
 				imUserFriendService.refreshGroupImUserFriend(musicGroupId, GroupType.PRACTICE);
 			}
 		}
-		//获取用户担任教务老师的所有VIP课列表
-		List<String> vipGroupIds = employeeDao.queryVipGroupIdByUserId(levelUserId);
 		if(vipGroupIds.size() > 0){
 			for (String musicGroupId : vipGroupIds) {
 				imUserFriendService.refreshGroupImUserFriend(musicGroupId, GroupType.VIP);

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

@@ -76,7 +76,11 @@ public class ImGroupMemberServiceImpl extends BaseServiceImpl<Long, ImGroupMembe
 		imGroupMember.setRoleType(roleType);
 		imGroupMember.setUpdateTime(date);
 		imGroupMember.setUserId(userId);
-		imGroupMember.setNickname(StringUtils.isBlank(user.getUsername()) ? user.getRealName() : user.getUsername());
+		if (StringUtils.isBlank(roleType)) {
+			imGroupMember.setNickname(user.getRealName());
+		} else {
+			imGroupMember.setNickname(user.getRealName());
+		}
 
 		imGroupMemberDao.insert(imGroupMember);
 

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

@@ -1752,10 +1752,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         if (musicGroup == null) {
             throw new BizException("乐团不存在");
         }
-		if (musicGroup.getStatus() == MusicGroupStatusEnum.PAY || musicGroup.getStatus() == MusicGroupStatusEnum.PREPARE
-				|| musicGroup.getStatus() == MusicGroupStatusEnum.PROGRESS || musicGroup.getStatus() == MusicGroupStatusEnum.CANCELED
-				|| musicGroup.getStatus() == MusicGroupStatusEnum.PAUSE || musicGroup.getStatus() == MusicGroupStatusEnum.CLOSE) {
-			throw new BizException("乐团当前状态下不能取消");
+		if (musicGroupQuit.getStatus() != ApprovalStatus.PROCESSING) {
+			throw new BizException("当前状态下不能取消");
 		}
         musicGroupQuit.setStatus(ApprovalStatus.CANCELED);
         musicGroupQuit.setReason(reason);

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

@@ -364,15 +364,14 @@
         GROUP BY su.id_,s.id_,sr.id_
     </select>
     <select id="queryNameByIds" resultType="java.util.Map" parameterType="list">
-        select id_ `key`,IF(real_name_ IS NUll,username_,real_name_) `value` FROM sys_user s WHERE FIND_IN_SET(id_,#{userIds})
+        select id_ `key`,IF(real_name_ IS NUll,'',real_name_) `value` FROM sys_user s WHERE FIND_IN_SET(id_,#{userIds})
     </select>
     <select id="queryNameByIdList" resultType="java.util.Map">
-        select id_ `key`,IF(real_name_ IS NUll,username_,real_name_) `value` FROM sys_user s WHERE id_ IN
+        select id_ `key`,IF(real_name_ IS NUll,'',real_name_) `value` FROM sys_user s WHERE id_ IN
         <foreach collection="userIds" item="userId" separator="," open="(" close=")">
             #{userId}
         </foreach>
     </select>
-
     <select id="queryUserNameByIdList" resultType="java.util.Map">
         select id_ `key`,IF(username_ IS NUll,real_name_,username_) `value` FROM sys_user s WHERE id_ IN
         <foreach collection="userIds" item="userId" separator="," open="(" close=")">
@@ -912,7 +911,7 @@
         <result column="is_super_admin_" property="isSuperAdmin"/>
         <result column="current_grade_" property="currentGrade"/>
         <result column="current_class_" property="currentClass"/>
-        <result column="certificate_type_" property="certificateType" />
+        <result column="certificate_type_" property="certificateType"/>
     </resultMap>
 
     <select id="getUser" resultMap="SysUser">
@@ -1237,8 +1236,7 @@
 		MAX(case when mgs.course_schedule_type_ = 'HIGH_ONLINE' then CONVERT(JSON_EXTRACT(mgs.salary_rule_json_,'$."4"'),DECIMAL) END) high_online4,
 		MAX(case when mgs.course_schedule_type_ = 'HIGH_ONLINE' then CONVERT(JSON_EXTRACT(mgs.salary_rule_json_,'$."5"'),DECIMAL) END) high_online5,
 		MAX(case when mgs.course_schedule_type_ = 'MUSIC_NETWORK' then CONVERT(JSON_EXTRACT(mgs.salary_rule_json_,'$."1"'),DECIMAL) END) music_network1
-		FROM `teacher` t
-		LEFT JOIN `sys_user` su on t.`id_` = su.`id_`
+		FROM `teacher` t LEFT JOIN `sys_user` su on t.`id_` = su.`id_` 
 		LEFT JOIN `organization` o on o.`id_` = t.`organ_id_` 
 		LEFT JOIN `teacher_default_vip_group_salary` gs on gs.`user_id_` = t.`id_`
 		LEFT JOIN `vip_group_category` gc on gc.`id_` = gs.`vip_group_category_id_`

mec-web/src/main/java/com/ym/mec/web/controller/ContractsController.java

@@ -85,4 +85,5 @@ public class ContractsController extends BaseController {
 		}
 		return succeed();
 	}
+
 }