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

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

@@ -2,6 +2,7 @@ package com.ym.mec.biz.dal.dao;
 
 import com.ym.mec.biz.dal.dto.ClassGroupTeachersDto;
 import com.ym.mec.biz.dal.entity.ClassGroupTeacherMapper;
+import com.ym.mec.biz.dal.enums.GroupType;
 import com.ym.mec.biz.dal.enums.TeachTypeEnum;
 import com.ym.mec.common.dal.BaseDAO;
 import org.apache.ibatis.annotations.Param;
@@ -61,7 +62,7 @@ public interface ClassGroupTeacherMapperDao extends BaseDAO<Long, ClassGroupTeac
      * @param classGroupTeacherMapperList
      * @return
      */
-    List<ClassGroupTeacherMapper> getClassGroupTeacherMapper(@Param("classGroupTeacherMapperList") List<ClassGroupTeacherMapper> classGroupTeacherMapperList);
+    List<ClassGroupTeacherMapper> getClassGroupTeacherMapper(@Param("classGroupTeacherMapperList") List<ClassGroupTeacherMapper> classGroupTeacherMapperList, @Param("groupType") GroupType groupType);
 
     /**
      * 批量删除班级老师关系
@@ -73,6 +74,7 @@ public interface ClassGroupTeacherMapperDao extends BaseDAO<Long, ClassGroupTeac
 
     /**
      * 获取助教名称列表
+     *
      * @param classGroupId
      * @return
      */

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

@@ -63,7 +63,7 @@ public class ClassGroupTeacherMapperServiceImpl extends BaseServiceImpl<Long, Cl
 
         List<ClassGroup> classGroups = classGroupService.findClassGroupByIds(classGroupIds);
 
-        List<ClassGroupTeacherMapper> oldClassGroupTeacherMapper = classGroupTeacherMapperDao.getClassGroupTeacherMapper(classGroupTeacherMapperList);
+        List<ClassGroupTeacherMapper> oldClassGroupTeacherMapper = classGroupTeacherMapperDao.getClassGroupTeacherMapper(classGroupTeacherMapperList,GroupType.MUSIC);
 
         for (ClassGroup classGroup : classGroups) {
             imGroupMemberList.clear();

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

@@ -143,7 +143,9 @@
         <foreach collection="classGroupTeacherMapperList" item="item" index="index" open="(" close=")" separator=",">
             #{item.classGroupId}
         </foreach>
+        AND group_type_ = #{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
     </select>
+
     <select id="queryTeachingNames" resultType="java.lang.String">
         SELECT GROUP_CONCAT(su.real_name_) FROM class_group_teacher_mapper cgtm
         LEFT JOIN sys_user su ON cgtm.user_id_ = su.id_