update

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

@@ -458,5 +458,12 @@ public interface CourseScheduleDao extends BaseDAO<Long, CourseSchedule> {
 	 */
 	List<IntegerAndIntegerListDto> findCourseScheduleIdAndUserIdsMap(@Param("courseScheduleIds") List<Integer> courseScheduleIds);
 
-
+	/**
+	 * @describe 获取班级编号和与之对应的教师编号列表
+	 * @author Joburgess
+	 * @date 2019/11/3
+	 * @param classGroup: 班级编号列表
+	 * @return java.util.List<com.ym.mec.biz.dal.dto.IntegerAndIntegerListDto>
+	 */
+	List<IntegerAndIntegerListDto> findClassGroupAndUserIdsMap(@Param("classGroupIds") List<Integer> classGroup);
 }

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

@@ -100,6 +100,15 @@ public interface CourseScheduleTeacherSalaryDao extends BaseDAO<Long, CourseSche
 	List<Map<String,String>> findMusicGroupSettlementTypeByCourse(@Param("courseScheduleIds") List<Long> courseScheduleIds);
 
 	/**
+	 * @describe 根据课程获取对应乐团的收费类型
+	 * @author Joburgess
+	 * @date 2019/11/3
+	 * @param courseScheduleIds: 课程编号列表
+	 * @return java.util.List<java.util.Map<java.lang.String,java.lang.Integer>>
+	 */
+	List<Map<String,Integer>> findMusicGroupChargeTypeByCourse(@Param("courseScheduleIds") List<Long> courseScheduleIds);
+
+	/**
 	 * @describe 根据课程获取对应的教学点补贴
 	 * @author Joburgess
 	 * @date 2019/10/24

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/SalarySettlementTypeEnum.java

@@ -11,8 +11,7 @@ public enum SalarySettlementTypeEnum implements BaseEnum<String,SalarySettlement
     TEACHER_DEFAULT("TEACHER_DEFAULT","老师默认课酬"),
     RATIO_DISCOUNT("RATIO_DISCOUNT","课程单价比例折扣"),
     FIXED_SALARY("FIXED_SALARY","固定课酬"),
-    GRADIENT_SALARY("GRADIENT_SALARY","梯度课酬"),
-    CLASSROOM_SALARY("CLASSROOM_SALARY","课堂课酬");
+    GRADIENT_SALARY("GRADIENT_SALARY","梯度课酬");
 
     private String code;
 

mec-biz/src/main/java/com/ym/mec/biz/service/SysConfigService.java

@@ -89,6 +89,9 @@ public interface SysConfigService extends BaseService<Long, SysConfig> {
 	String STUDENT_APPLY_PAYMENT_DETAIL_URL = "student_apply_payment_detail_url";
 	String SERVER_PHONE = "server_phone";
 
+	/** 乐团课90分钟课酬计算时的收费类型 */
+	String MUSIC_GROUP_CHARGE_TYPE_90_="music_group_charge_type_90_";
+
 	/**
 	 * @params paramName
 	 * @return com.ym.mec.biz.dal.entity.SysConfig

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

@@ -1,8 +1,6 @@
 package com.ym.mec.biz.service.impl;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.*;
@@ -948,15 +946,15 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                         //对应基准课酬
                         BigDecimal baseSalary = classGroupTeacherMapper.getTeacherRole().equals(TeachTypeEnum.BISHOP) ? teacherDefaultMusicGroupSalary.getMainTeacher30MinSalary() : teacherDefaultMusicGroupSalary.getAssistantTeacher30MinSalary();
                         //基准课酬
-                        if (teacherDefaultMusicGroupSalary.getSettlementType().equals(SalarySettlementTypeEnum.TEACHER_DEFAULT)) {
-                            salary = new BigDecimal(classCourseDuration).divide(new BigDecimal(30)).multiply(baseSalary).setScale(2, BigDecimal.ROUND_HALF_UP);
-                            break;
-                        }
-                        //阶梯课酬
-                        if (classCourseDuration >= teacherDefaultMusicGroupSalary.getDurationMin() && classCourseDuration <= teacherDefaultMusicGroupSalary.getDurationMin()) {
-                            salary = baseSalary;
-                            break;
-                        }
+//                        if (teacherDefaultMusicGroupSalary.getSettlementType().equals(SalarySettlementTypeEnum.TEACHER_DEFAULT)) {
+//                            salary = new BigDecimal(classCourseDuration).divide(new BigDecimal(30)).multiply(baseSalary).setScale(2, BigDecimal.ROUND_HALF_UP);
+//                            break;
+//                        }
+//                        //阶梯课酬
+//                        if (classCourseDuration >= teacherDefaultMusicGroupSalary.getDurationMin() && classCourseDuration <= teacherDefaultMusicGroupSalary.getDurationMin()) {
+//                            salary = baseSalary;
+//                            break;
+//                        }
                     }
 
                     CourseScheduleTeacherSalary courseScheduleTeacherSalary = new CourseScheduleTeacherSalary();
@@ -1149,15 +1147,15 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                         //对应基准课酬
                         BigDecimal baseSalary = classGroupTeacherMapper.getTeacherRole().equals(TeachTypeEnum.BISHOP) ? teacherDefaultMusicGroupSalary.getMainTeacher30MinSalary() : teacherDefaultMusicGroupSalary.getAssistantTeacher30MinSalary();
                         //基准课酬
-                        if (teacherDefaultMusicGroupSalary.getSettlementType().equals(SalarySettlementTypeEnum.TEACHER_DEFAULT)) {
-                            salary = new BigDecimal(classCourseDuration).divide(new BigDecimal(30)).multiply(baseSalary).setScale(2, BigDecimal.ROUND_HALF_UP);
-                            break;
-                        }
-                        //阶梯课酬
-                        if (classCourseDuration >= teacherDefaultMusicGroupSalary.getDurationMin() && classCourseDuration <= teacherDefaultMusicGroupSalary.getDurationMin()) {
-                            salary = baseSalary;
-                            break;
-                        }
+//                        if (teacherDefaultMusicGroupSalary.getSettlementType().equals(SalarySettlementTypeEnum.TEACHER_DEFAULT)) {
+//                            salary = new BigDecimal(classCourseDuration).divide(new BigDecimal(30)).multiply(baseSalary).setScale(2, BigDecimal.ROUND_HALF_UP);
+//                            break;
+//                        }
+//                        //阶梯课酬
+//                        if (classCourseDuration >= teacherDefaultMusicGroupSalary.getDurationMin() && classCourseDuration <= teacherDefaultMusicGroupSalary.getDurationMin()) {
+//                            salary = baseSalary;
+//                            break;
+//                        }
                     }
 
                     CourseScheduleTeacherSalary courseScheduleTeacherSalary = new CourseScheduleTeacherSalary();
@@ -1352,15 +1350,15 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                         //对应基准课酬
                         BigDecimal baseSalary = classGroupTeacherMapper.getTeacherRole().equals(TeachTypeEnum.BISHOP) ? teacherDefaultMusicGroupSalary.getMainTeacher30MinSalary() : teacherDefaultMusicGroupSalary.getAssistantTeacher30MinSalary();
                         //基准课酬
-                        if (teacherDefaultMusicGroupSalary.getSettlementType().equals(SalarySettlementTypeEnum.TEACHER_DEFAULT)) {
-                            salary = new BigDecimal(classCourseDuration).divide(new BigDecimal(30)).multiply(baseSalary).setScale(2, BigDecimal.ROUND_HALF_UP);
-                            break;
-                        }
+//                        if (teacherDefaultMusicGroupSalary.getSettlementType().equals(SalarySettlementTypeEnum.TEACHER_DEFAULT)) {
+//                            salary = new BigDecimal(classCourseDuration).divide(new BigDecimal(30)).multiply(baseSalary).setScale(2, BigDecimal.ROUND_HALF_UP);
+//                            break;
+//                        }
                         //阶梯课酬
-                        if (classCourseDuration >= teacherDefaultMusicGroupSalary.getDurationMin() && classCourseDuration <= teacherDefaultMusicGroupSalary.getDurationMin()) {
-                            salary = baseSalary;
-                            break;
-                        }
+//                        if (classCourseDuration >= teacherDefaultMusicGroupSalary.getDurationMin() && classCourseDuration <= teacherDefaultMusicGroupSalary.getDurationMin()) {
+//                            salary = baseSalary;
+//                            break;
+//                        }
                     }
 
                     CourseScheduleTeacherSalary courseScheduleTeacherSalary = new CourseScheduleTeacherSalary();

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

@@ -121,19 +121,21 @@ public class ClassGroupTeacherMapperServiceImpl extends BaseServiceImpl<Long, Cl
                 }
                 BigDecimal salary = new BigDecimal("0");
                 List<TeacherDefaultMusicGroupSalary> teacherDefaultMusicGroupSalaryList = classGroupTeacherMapper.getTeacherDefaultMusicGroupSalaryList();
+
+
                 for (TeacherDefaultMusicGroupSalary teacherDefaultMusicGroupSalary : teacherDefaultMusicGroupSalaryList) {
                     //对应基准课酬
-                    BigDecimal baseSalary = classGroupTeacherMapper.getTeacherRole().equals(TeachTypeEnum.BISHOP) ? teacherDefaultMusicGroupSalary.getMainTeacher30MinSalary() : teacherDefaultMusicGroupSalary.getAssistantTeacher30MinSalary();
-                    //基准课酬
-                    if (teacherDefaultMusicGroupSalary.getSettlementType().equals(SalarySettlementTypeEnum.TEACHER_DEFAULT)) {
-                        salary = new BigDecimal(duration).divide(new BigDecimal(30),8,BigDecimal.ROUND_HALF_UP).multiply(baseSalary).setScale(2, BigDecimal.ROUND_HALF_UP);
-                        break;
-                    }
-                    //阶梯课酬
-                    if (duration >= teacherDefaultMusicGroupSalary.getDurationMin() && duration <= teacherDefaultMusicGroupSalary.getDurationMin()) {
-                        salary = baseSalary;
-                        break;
-                    }
+//                    BigDecimal baseSalary = classGroupTeacherMapper.getTeacherRole().equals(TeachTypeEnum.BISHOP) ? teacherDefaultMusicGroupSalary.getMainTeacher30MinSalary() : teacherDefaultMusicGroupSalary.getAssistantTeacher30MinSalary();
+//                    //基准课酬
+//                    if (teacherDefaultMusicGroupSalary.getSettlementType().equals(SalarySettlementTypeEnum.TEACHER_DEFAULT)) {
+//                        salary = new BigDecimal(duration).divide(new BigDecimal(30),8,BigDecimal.ROUND_HALF_UP).multiply(baseSalary).setScale(2, BigDecimal.ROUND_HALF_UP);
+//                        break;
+//                    }
+//                    //阶梯课酬
+//                    if (duration >= teacherDefaultMusicGroupSalary.getDurationMin() && duration <= teacherDefaultMusicGroupSalary.getDurationMin()) {
+//                        salary = baseSalary;
+//                        break;
+//                    }
                 }
 
                 //课程与老师薪水表
@@ -199,36 +201,19 @@ public class ClassGroupTeacherMapperServiceImpl extends BaseServiceImpl<Long, Cl
                 throw new BizException("存在未指定结算方式的课程类型");
             }
 
-            //根据结算方式将对应课程类型下的默认课酬设置列表分组
-            Map<String, List<TeacherDefaultMusicGroupSalary>> teacherDefaultMusicGroupSalaryGroupBySettlementType = teacherDefaultMusicGroupSalariesWithCourseType.stream().collect(Collectors.groupingBy(teacherDefaultMusicGroupSalary -> teacherDefaultMusicGroupSalary.getSettlementType().getCode()));
-
-            //获取对应结算方式下的默认课酬设置列表
-            List<TeacherDefaultMusicGroupSalary> teacherDefaultMusicGroupSalariesWithSettlementType = teacherDefaultMusicGroupSalaryGroupBySettlementType.get(settlementType);
-            if (CollectionUtils.isEmpty(teacherDefaultMusicGroupSalariesWithSettlementType)) {
-                throw new BizException("未找到结算方式对应的默认课酬");
-            }
-
             //根据教师编号将对应结算方式下的默认课酬设置分组
-            Map<Integer, List<TeacherDefaultMusicGroupSalary>> teacherDefaultMusicGroupSalariesGroupByTeacherId = teacherDefaultMusicGroupSalariesWithSettlementType.stream().collect(Collectors.groupingBy(TeacherDefaultMusicGroupSalary::getUserId));
-
-            //课时长度
-            int duration = DateUtil.minutesBetween(courseSchedule.getEndClassTime(), courseSchedule.getStartClassTime());
-
-            //课程时长与结算单位时长占比
-            BigDecimal classTimeDuty = new BigDecimal(duration).divide(teacherSalaryTimeUnit);
+            Map<Integer, TeacherDefaultMusicGroupSalary> teacherDefaultMusicGroupSalariesGroupByTeacherId = teacherDefaultMusicGroupSalariesWithCourseType.stream().collect(Collectors.toMap(TeacherDefaultMusicGroupSalary::getUserId,teacherDefaultMusicGroupSalary -> teacherDefaultMusicGroupSalary));
 
             if (!courseSchedule.isBishopTeacherSalaryNotCreate()) {
                 //根据课程获取主教的默认课酬设置列表
-                List<TeacherDefaultMusicGroupSalary> teacherDefaultMusicGroupSalariesWithTeacherId = teacherDefaultMusicGroupSalariesGroupByTeacherId.get(courseSchedule.getActualTeacherId());
+                TeacherDefaultMusicGroupSalary teacherDefaultMusicGroupSalaryWithTeacherId = teacherDefaultMusicGroupSalariesGroupByTeacherId.get(courseSchedule.getActualTeacherId());
                 courseScheduleTeacherSalaryList.add(countMusicGroupTeacherSalary(
                         courseSchedule,
                         TeachTypeEnum.BISHOP,
                         settlementType,
-                        classTimeDuty,
                         courseSubsidyMap.get(courseSchedule.getId()),
-                        duration,
                         courseSchedule.getActualTeacherId().intValue(),
-                        teacherDefaultMusicGroupSalariesWithTeacherId));
+                        teacherDefaultMusicGroupSalaryWithTeacherId));
             }
 
             //计算助教课程薪酬
@@ -238,30 +223,26 @@ public class ClassGroupTeacherMapperServiceImpl extends BaseServiceImpl<Long, Cl
                 return;
             }
             teachingTeacherIdList.forEach(teacherId -> {
-                List<TeacherDefaultMusicGroupSalary> teachingTeacherDefaultMusicGroupSalariesWithTeacherId = teacherDefaultMusicGroupSalariesGroupByTeacherId.get(teacherId);
+                TeacherDefaultMusicGroupSalary teacherDefaultMusicGroupSalaryWithTeacherId = teacherDefaultMusicGroupSalariesGroupByTeacherId.get(teacherId);
                 courseScheduleTeacherSalaryList.add(countMusicGroupTeacherSalary(
                         courseSchedule,
                         TeachTypeEnum.TEACHING,
                         settlementType,
-                        classTimeDuty,
                         courseSubsidyMap.get(courseSchedule.getId()),
-                        duration,
                         teacherId,
-                        teachingTeacherDefaultMusicGroupSalariesWithTeacherId));
+                        teacherDefaultMusicGroupSalaryWithTeacherId));
             });
         });
         courseScheduleTeacherSalaryDao.batchInsert(courseScheduleTeacherSalaryList);
     }
 
     /**
-     * @param courseSchedule:
-     * @param teachType:
-     * @param settlementType:
-     * @param classTimeDuty:
-     * @param subsidy:
-     * @param duration:
-     * @param teacherId:
-     * @param teacherDefaultMusicGroupSalariesWithTeacherId:
+     * @param courseSchedule: 课程信息
+     * @param teachType: 教师类型
+     * @param settlementType: 结算方式
+     * @param subsidy: 补贴
+     * @param teacherId: 教师编号
+     * @param teacherDefaultMusicGroupSalaryWithTeacherId: 教师课酬
      * @return com.ym.mec.biz.dal.entity.CourseScheduleTeacherSalary
      * @describe 计算教师课酬
      * @author Joburgess
@@ -270,36 +251,33 @@ public class ClassGroupTeacherMapperServiceImpl extends BaseServiceImpl<Long, Cl
     private CourseScheduleTeacherSalary countMusicGroupTeacherSalary(CourseSchedule courseSchedule,
                                                                      TeachTypeEnum teachType,
                                                                      String settlementType,
-                                                                     BigDecimal classTimeDuty,
                                                                      BigDecimal subsidy,
-                                                                     int duration,
                                                                      Integer teacherId,
-                                                                     List<TeacherDefaultMusicGroupSalary> teacherDefaultMusicGroupSalariesWithTeacherId) {
-        if (CollectionUtils.isEmpty(teacherDefaultMusicGroupSalariesWithTeacherId)) {
+                                                                     TeacherDefaultMusicGroupSalary teacherDefaultMusicGroupSalaryWithTeacherId) {
+        if (Objects.isNull(teacherDefaultMusicGroupSalaryWithTeacherId)) {
             throw new BizException("存在未设置默认课酬的教师");
         }
         //教师课酬
         BigDecimal teacherSalary = new BigDecimal(0);
 
+        //课时长度
+        int duration = DateUtil.minutesBetween(courseSchedule.getEndClassTime(), courseSchedule.getStartClassTime());
+
         //如果结算方式是教师默认课酬
         if (settlementType.equals(SalarySettlementTypeEnum.TEACHER_DEFAULT)) {
-            TeacherDefaultMusicGroupSalary bishopTeacherDefaultMusicGroupSalary = teacherDefaultMusicGroupSalariesWithTeacherId.get(0);
-            if (Objects.isNull(bishopTeacherDefaultMusicGroupSalary)) {
-                throw new BizException("存在未设置默认课酬的教师");
-            }
-            BigDecimal bishopTeacherDefaultSalary = teachType == TeachTypeEnum.BISHOP ? bishopTeacherDefaultMusicGroupSalary.getMainTeacher30MinSalary() : bishopTeacherDefaultMusicGroupSalary.getAssistantTeacher30MinSalary();
-            teacherSalary = bishopTeacherDefaultSalary.multiply(classTimeDuty).setScale(2, BigDecimal.ROUND_HALF_UP);
+            //课程时长与结算单位时长占比
+            BigDecimal classTimeDuty = new BigDecimal(duration).divide(new BigDecimal(30));
+            BigDecimal teacherDefaultSalary = teachType == TeachTypeEnum.BISHOP ? teacherDefaultMusicGroupSalaryWithTeacherId.getMainTeacher30MinSalary() : teacherDefaultMusicGroupSalaryWithTeacherId.getAssistantTeacher30MinSalary();
+            teacherSalary = teacherDefaultSalary.multiply(classTimeDuty).setScale(2, BigDecimal.ROUND_HALF_UP);
         } else if (settlementType.equals(SalarySettlementTypeEnum.GRADIENT_SALARY)) {
-            for (TeacherDefaultMusicGroupSalary teacherDefaultMusicGroupSalary : teacherDefaultMusicGroupSalariesWithTeacherId) {
-                if (duration >= teacherDefaultMusicGroupSalary.getDurationMin() && duration <= teacherDefaultMusicGroupSalary.getDurationMin()) {
-                    teacherSalary = teachType == TeachTypeEnum.BISHOP ? teacherDefaultMusicGroupSalary.getMainTeacher30MinSalary() : teacherDefaultMusicGroupSalary.getAssistantTeacher30MinSalary();
-                    break;
-                }
-            }
+            //课程时长与结算单位时长占比
+            BigDecimal classTimeDuty = new BigDecimal(duration).divide(new BigDecimal(90));
+            BigDecimal teacherDefaultSalary = teachType == TeachTypeEnum.BISHOP ? teacherDefaultMusicGroupSalaryWithTeacherId.getMainTeacher30MinSalary() : teacherDefaultMusicGroupSalaryWithTeacherId.getAssistantTeacher30MinSalary();
+            teacherSalary = teacherDefaultSalary.multiply(classTimeDuty).setScale(2, BigDecimal.ROUND_HALF_UP);
         }
         return new CourseScheduleTeacherSalary(
                 courseSchedule.getId(),
-                TeachTypeEnum.BISHOP,
+                teachType,
                 teacherId,
                 teacherSalary,
                 subsidy,

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

@@ -292,6 +292,11 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 				.stream()
 				.collect(Collectors.groupingBy(ClassGroupStudentMapper::getClassGroupId));
 
+//        allCourseSchedules
+//                    .stream()
+//                    .filter(courseSchedule -> Objects.nonNull(courseSchedule.getId()))
+//                    .map(CourseSchedule::getId)
+//                    .collect(Collectors.toList());
 
         courseScheduleDao.findCourseScheduleIdAndUserIdsMap(new ArrayList<>());
 

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

@@ -925,8 +925,12 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 			sysUserCashAccountDetail.setAttribute(studentApplyRefunds.getId().toString());
 			sysUserCashAccountDetailDao.insert(sysUserCashAccountDetail);
 
-			classGroupStudentMapperDao.deleteStudentByClassGroupId(studentPaymentOrder.getClassGroupId().longValue(), studentPaymentOrder.getUserId()
-					.longValue());
+			ClassGroupStudentMapper classStudentMapperByUserIdAndClassGroupId = classGroupStudentMapperDao.findClassStudentMapperByUserIdAndClassGroupId(studentPaymentOrder.getUserId(),
+					studentPaymentOrder.getClassGroupId());
+
+			classStudentMapperByUserIdAndClassGroupId.setStatus(ClassGroupStudentStatusEnum.LEAVE);
+			classGroupStudentMapperDao.update(classStudentMapperByUserIdAndClassGroupId);
+
 			break;
 		case REJECT:
 

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

@@ -1120,4 +1120,15 @@
             #{courseScheduleId}
         </foreach>
     </select>
+    <select id="findClassGroupAndUserIdsMap" resultMap="IntegerAndIntegerListDto">
+        SELECT
+            class_group_id_ id_,
+            user_id_ relate_ids
+        FROM
+            class_group_teacher_mapper
+        WHERE class_group_id_ IN
+        <foreach collection="classGroupIds" item="classGroupId" open="(" close=")" separator=",">
+            #{classGroupId}
+        </foreach>
+    </select>
 </mapper>

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

@@ -192,15 +192,26 @@
 			#{courseScheduleId}
 		</foreach>
 	</select>
+	<select id="findMusicGroupChargeTypeByCourse" resultType="map">
+		SELECT
+			cs.id_ AS 'key',
+			mg.charge_type_id_ AS 'value'
+		FROM
+			course_schedule cs
+			LEFT JOIN class_group cg ON cs.class_group_id_=cg.id_
+			LEFT JOIN music_group mg ON cg.music_group_id_=mg.id_
+		WHERE cs.id_ IN
+		<foreach collection="courseScheduleIds" item="courseScheduleId" open="(" close=")" separator=",">
+			#{courseScheduleId}
+		</foreach>
+	</select>
 	<select id="findCourseSubsidyByCourses" resultType="map">
 		SELECT
 			cs.id_,
 			s.subsidy_
 		FROM
 			course_schedule cs
-			LEFT JOIN class_group cg ON cs.class_group_id_=cg.id_
-			LEFT JOIN music_group mg ON cg.music_group_id_=mg.id_
-			LEFT JOIN school s ON mg.school_id_=s.id_
+			LEFT JOIN school s ON cs.schoole_id_=s.id_
 		WHERE cs.id_ IN
 		<foreach collection="courseScheduleIds" item="courseScheduleId" open="(" close=")" separator=",">
 			#{courseScheduleId}
@@ -221,7 +232,7 @@
 		WHERE csts.course_schedule_id_ = #{courseScheduleId}
 	</select>
 
-    <update id="batchUpdateWages" parameterType="map">
+	<update id="batchUpdateWages" parameterType="map">
 		UPDATE course_schedule_teacher_salary set
 			subsidy_ = #{subsidy},
 			expect_salary_ = #{salary},