Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

@@ -29,29 +29,37 @@ public interface ClassGroupTeacherMapperDao extends BaseDAO<Long, ClassGroupTeac
 
     /**
      * 批量删除班级的老师关联关系
+     *
      * @param classGroupTeacherMapperList
      * @return
      */
     int delMusicGroupTeacherMapper(@Param("classGroupTeacherMapperList") List<ClassGroupTeacherMapper> classGroupTeacherMapperList);
 
     /**
-     * @Author: Joburgess
-     * @Date: 2019/10/18
      * @param classGroupId:班级编号
      * @param teacherRole:
      * @return com.ym.mec.biz.dal.entity.ClassGroupTeacherMapper
+     * @Author: Joburgess
+     * @Date: 2019/10/18
      * @describe 根据班级编号和教师类型获取老师信息
      */
     ClassGroupTeacherMapper findByClassGroupAndRole(@Param("classGroupId") Long classGroupId,
                                                     @Param("teacherRole") TeachTypeEnum teacherRole);
 
     /**
+     * @param musicGroupId:
+     * @return java.util.List<com.ym.mec.biz.dal.entity.ClassGroupTeacherMapper>
      * @describe 获取乐团下的所有主教老师
      * @author Joburgess
      * @date 2019/10/18
-     * @param musicGroupId:
-     * @return java.util.List<com.ym.mec.biz.dal.entity.ClassGroupTeacherMapper>
      */
     List<ClassGroupTeacherMapper> findByMusicGroup(String musicGroupId);
 
+    /**
+     * 批量查询班级的老师关联关系
+     *
+     * @param classGroupTeacherMapperList
+     * @return
+     */
+    List<ClassGroupTeacherMapper> getClassGroupTeacherMapper(@Param("classGroupTeacherMapperList") List<ClassGroupTeacherMapper> classGroupTeacherMapperList);
 }

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

@@ -55,9 +55,6 @@ public class ClassGroupTeacherMapperServiceImpl extends BaseServiceImpl<Long, Cl
     @Override
     @Transactional(rollbackFor = Exception.class)
     public int classGroupTeachersInsert(List<ClassGroupTeacherMapper> classGroupTeacherMapperList) {
-        //删除班级已经设置的老师
-        classGroupTeacherMapperDao.delMusicGroupTeacherMapper(classGroupTeacherMapperList);
-
         //老师加入群组
         List<ImGroupMember> imGroupMemberList = new ArrayList<>();
         String classGroupIds = "";
@@ -67,6 +64,8 @@ public class ClassGroupTeacherMapperServiceImpl extends BaseServiceImpl<Long, Cl
         classGroupIds = classGroupIds.substring(0, classGroupIds.length() - 1);
         List<ClassGroup> classGroups = classGroupService.findClassGroupByIds(classGroupIds);
 
+        //删除群组
+        List<ClassGroupTeacherMapper> oldClassGroupTeacherMapper = classGroupTeacherMapperDao.getClassGroupTeacherMapper(classGroupTeacherMapperList);
         for (ClassGroupTeacherMapper classGroupTeacherMapper : classGroupTeacherMapperList) {
             for (ClassGroup classGroup : classGroups) {
                 if (!classGroup.getId().equals(classGroupTeacherMapper.getClassGroupId())) continue;
@@ -76,6 +75,7 @@ public class ClassGroupTeacherMapperServiceImpl extends BaseServiceImpl<Long, Cl
                 imFeignService.groupJoin(new ImGroupModel(classGroupTeacherMapper.getClassGroupId().toString(), imGroupMembers, classGroup.getName()));
             }
         }
+        classGroupTeacherMapperDao.delMusicGroupTeacherMapper(classGroupTeacherMapperList);
 
         return classGroupTeacherMapperDao.classGroupTeachersInsert(classGroupTeacherMapperList);
     }

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

@@ -157,6 +157,6 @@
     <select id="findClassStudentList" resultMap="com.ym.mec.biz.dal.dao.StudentRegistrationDao.StudentRegistration">
         SELECT sr.* FROM class_group_student_mapper cgsm
         LEFT JOIN student_registration sr ON (sr.user_id_ = cgsm.user_id_ AND sr.music_group_id_ = cgsm.music_group_id_)
-        WHERE cgsm.class_group_id_ = #{classGroupId} AND cgsm.status_ = #{status}
+        WHERE cgsm.class_group_id_ = #{classGroupId} AND cgsm.status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
     </select>
 </mapper>

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

@@ -124,11 +124,19 @@
         AND ct.teacher_role_="BISHOP"
     </select>
 
-    <!-- 删除对应乐团老师关联关系 -->
+    <!-- 删除对应班级老师关联关系 -->
     <delete id="delMusicGroupTeacherMapper">
         DELETE FROM class_group_teacher_mapper WHERE class_group_id_ IN
         <foreach collection="classGroupTeacherMapperList" item="item" index="index" open="(" close=")" separator=",">
             #{item.classGroupId}
         </foreach>
     </delete>
+
+    <!-- 获取班级老师关联关系 -->
+    <select id="getClassGroupTeacherMapper" resultMap="ClassGroupTeacherMapper">
+        SELECT * FROM class_group_teacher_mapper WHERE class_group_id_ IN
+        <foreach collection="classGroupTeacherMapperList" item="item" index="index" open="(" close=")" separator=",">
+            #{item.classGroupId}
+        </foreach>
+    </select>
 </mapper>