Merge remote-tracking branch 'origin/feature/0427-school' into feature/0427-school

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

@@ -3,6 +3,8 @@ package com.ym.mec.biz.dal.dao;
 import com.ym.mec.biz.dal.dto.ImGroupMemberDto;
 import com.ym.mec.biz.dal.dto.NameDto;
 import com.ym.mec.biz.dal.entity.ImGroup;
+import com.ym.mec.biz.dal.enums.EFriendRoleType;
+import com.ym.mec.biz.dal.enums.school.ESchoolStaffType;
 import com.ym.mec.biz.dal.wrapper.ImGroupWrapper;
 import com.ym.mec.common.dal.BaseDAO;
 import org.apache.ibatis.annotations.Param;
@@ -62,4 +64,12 @@ public interface ImGroupDao extends BaseDAO<String, ImGroup> {
     List<ImGroup> getByUserId(@Param("param") ImGroupWrapper.ImQuery query);
 
     int updateMember(@Param("imGroupId") String imGroupId, @Param("num") int num);
+
+    /**
+     * 修改学校信息
+     *
+     * @param userId
+     * @param userType
+     */
+    void updateSchoolRoleType(@Param("userId") Long userId, @Param("userType") EFriendRoleType userType);
 }

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

@@ -2479,19 +2479,6 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 }
             }
 
-            List<Integer> classGroupIds = new ArrayList<>();
-            classGroupIds.add(classGroupId);
-            // 删除历史记录
-            classGroupTeacherMapperService.getDao().delClassGroupTeacherMapper(classGroupIds);
-            for (ClassGroupTeacherMapper tm : newTeacherMapperList) {
-                tm.setClassGroupId(classGroupId);
-                tm.setCreateTime(date);
-                tm.setGroupType(GroupType.MUSIC);
-                tm.setMusicGroupId(musicGroupId);
-                tm.setUpdateTime(date);
-                classGroupTeacherMapperService.getDao().insert(tm);
-            }
-            imUserFriendService.refreshClassImUserFriend(classGroupId);
             // 通知学校端
             for (ClassGroup4MixDto classGroup4MixDto : classGroup4MixDtos) {
                 if (CollectionUtils.isEmpty(classGroup4MixDto.getClassGroupTeacherMapperList())) {
@@ -2508,6 +2495,21 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
             }
 
 
+            List<Integer> classGroupIds = new ArrayList<>();
+            classGroupIds.add(classGroupId);
+            // 删除历史记录
+            classGroupTeacherMapperService.getDao().delClassGroupTeacherMapper(classGroupIds);
+            for (ClassGroupTeacherMapper tm : newTeacherMapperList) {
+                tm.setClassGroupId(classGroupId);
+                tm.setCreateTime(date);
+                tm.setGroupType(GroupType.MUSIC);
+                tm.setMusicGroupId(musicGroupId);
+                tm.setUpdateTime(date);
+                classGroupTeacherMapperService.getDao().insert(tm);
+            }
+            imUserFriendService.refreshClassImUserFriend(classGroupId);
+
+
             return BaseController.succeed(classGroup);
         }
         if (classGroup4MixDtos.get(0).getCourseTimes().compareTo(0) <= 0) {

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

@@ -12,6 +12,7 @@ import com.ym.mec.auth.api.enums.SysUserType;
 import com.ym.mec.auth.api.enums.YesOrNoEnum;
 import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.entity.*;
+import com.ym.mec.biz.dal.enums.EFriendRoleType;
 import com.ym.mec.biz.dal.enums.MessageTypeEnum;
 import com.ym.mec.biz.dal.enums.MusicGroupStatusEnum;
 import com.ym.mec.biz.dal.enums.StudentMusicGroupStatusEnum;
@@ -74,6 +75,8 @@ public class SchoolStaffServiceImpl extends ServiceImpl<SchoolStaffMapper, Schoo
     @Autowired
     private SysUserFeignService sysUserFeignService;
 
+    @Autowired
+    private ImGroupDao imGroupDao;
 
     @Autowired
     private RealnameAuthenticationPluginContext realnameAuthenticationPluginContext;
@@ -745,6 +748,10 @@ public class SchoolStaffServiceImpl extends ServiceImpl<SchoolStaffMapper, Schoo
             // 创建学校员工IM好友
             imUserFriendService.refreshSchoolStaffFriend(schoolStaff.getSchoolId().intValue());
 
+            // 修改群用户类型
+            imGroupDao.updateSchoolRoleType(schoolStaff.getUserId(), EFriendRoleType.getByName(schoolStaffUpdate.getUserType().name()));
+
+
             if (schoolStaffUpdate.getUserType().equals(ESchoolStaffType.ORCHESTRA_LEADER)) {
                 addMusicGroup(SchoolStaffWrapper.SchoolStaff.builder()
                         .schoolId(schoolStaff.getSchoolId())

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

@@ -288,4 +288,8 @@
             and ig.group_type_ = #{param.groupType.code}
         </if>
     </select>
+
+	<update id="updateSchoolRoleType">
+        update im_group_member set role_type_ = #{userType.msg} ,type_ = #{userType.name}  where user_id_ = #{userId}
+    </update>
 </mapper>

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

@@ -193,7 +193,7 @@
 
 	<select id="queryCountOfUnread" resultMap="Mapper" parameterType="map">
 		SELECT group_ key_,COUNT(*) value_ FROM sys_message
-		WHERE user_id_ = #{userId} AND read_status_ = 0 and status_ = 2
+		WHERE user_id_ = #{userId} AND read_status_ = 0
         <if test="tenantId != null">
             AND tenant_id_ = #{tenantId}
         </if>