Merge remote-tracking branch 'origin/master'

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

@@ -519,7 +519,7 @@ public interface ClassGroupDao extends BaseDAO<Integer, ClassGroup> {
      * @param classGroupIdList
      * @return
      */
-    int batchUpdateStudentNumMinusOne(List<Integer> classGroupIdList);
+    int batchUpdateStudentNumMinusOne(@Param("classGroupIds") List<Integer> classGroupIdList);
 
     int updateTest(@Param("delFlag") YesOrNoEnum delFlag);
 }

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

@@ -72,7 +72,7 @@ public interface TeacherDao extends BaseDAO<Integer, Teacher> {
      * @param organId
      * @return
      */
-    List<Teacher> findTeachers(@Param("organId") String organId);
+    List<Teacher> findTeachers(@Param("organId") String[] organId);
 
     /**
      * count上课结算列表

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

@@ -704,7 +704,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		//获取对应未修改的课程列表
 		List<CourseSchedule> oldCourseScheduleList = courseScheduleDao.findByCourseScheduleIds(newCourseScheduleIds);
 //		if(oldCourseScheduleList.size()!=newCourseSchedules.size()){
-		if(oldCourseScheduleList.size()<=newCourseSchedules.size()){
+		if(oldCourseScheduleList.size()<newCourseSchedules.size()){
 			throw new BizException("课程信息错误");
 		}
 

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

@@ -197,7 +197,11 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 
     @Override
     public List<Teacher> findTeachers(String organId) {
-		return teacherDao.findTeachers(organId);
+		String[] organIds = null;
+		if(StringUtils.isNotEmpty(organId)){
+			organIds = organId.split(",");
+		}
+		return teacherDao.findTeachers(organIds);
     }
 
 	@Override

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

@@ -1127,7 +1127,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		Set<Integer> roleIds = new HashSet<>(1);
 		roleIds.add(SysUserRole.EDUCATIONAL_TEACHER);
 		Map<String,Object> memo = new HashMap<>(2);
-		memo.put("Id",vipGroupId);
+		memo.put("Id",studentApplyRefunds.getId());
 		memo.put("type","VIPGROUP");
 		sysMessageService.batchSeoMessage(musicGroupDao.queryUserIdByRoleId(roleIds,sysUser.getOrganId()),MessageTypeEnum.BACKSTAGE_STUDENT_APPLY_QUIT_COURSE,JSONObject.toJSONString(memo),sysUser.getUsername());
 	}

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

@@ -1206,6 +1206,8 @@
     <select id="findAllCourseByDateZone" resultMap="CourseSchedule">
         SELECT
             cs.id_,
+            cs.music_group_id_,
+            cs.group_type_,
             cs.class_group_id_,
             cs.status_,
             cs.subsidy_,

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

@@ -273,11 +273,14 @@
     </select>
 
     <select id="findTeachers" resultMap="Teacher">
-        SELECT su.* FROM teacher t
+        SELECT su.id_,su.real_name_ FROM teacher t
         LEFT JOIN sys_user su on t.id_ = su.id_
         <where>
             <if test="organId != null">
-                FIND_IN_SET(t.organ_id_,#{organId})
+                t.organ_id_ IN
+                <foreach collection="organId" separator="," open="(" close=")" item="item">
+                    #{item}
+                </foreach>
             </if>
         </where>
     </select>