Merge remote-tracking branch 'origin/master'

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

@@ -176,7 +176,7 @@ public interface TeacherAttendanceDao extends BaseDAO<Long, TeacherAttendance> {
 	 */
 	int batchCleanCourseTeacherSignInfo(@Param("courseScheduleIds") List<Long> courseScheduleIds);
 
-    TeacherAttendance getTeacherPersonalAttendance(Integer courseScheduleId);
+    TeacherAttendance getMainTeacherAttendance(Integer courseScheduleId);
 
 	/**
 	 * 连堂课签到，签退

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

@@ -3302,13 +3302,13 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 							ts.setExpectSalary(salary);
 						}
 						//基础技能提高课
-						if (newCourseSchedule.getType() == CourseScheduleType.HIGH) {
+						/*if (newCourseSchedule.getType() == CourseScheduleType.HIGH) {
 							BigDecimal salary = ts.getTeacherRole().equals(TeachTypeEnum.BISHOP) ? tdms.getMainTeacher30MinSalary() : tdms.getAssistantTeacher30MinSalary();
 							if (StringUtils.equals(settlementType, "GRADIENT_SALARY")) {
 								salary = ts.getTeacherRole().equals(TeachTypeEnum.BISHOP) ? tdms.getMainTeacher90MinSalary() : tdms.getAssistantTeacher90MinSalary();
 							}
 							ts.setExpectSalary(salary);
-						}
+						}*/
 
 						if((newCourseSchedule.getType() == CourseScheduleType.HIGH_ONLINE ||
 								newCourseSchedule.getType().equals(CourseSchedule.CourseScheduleType.MUSIC_NETWORK)) &&
@@ -3318,8 +3318,11 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 						}
 
 						//线上小班课
-						if(newCourseSchedule.getType() == CourseScheduleType.HIGH_ONLINE || newCourseSchedule.getType() == CourseScheduleType.MUSIC_NETWORK){
+						if(newCourseSchedule.getType() == CourseScheduleType.HIGH_ONLINE || newCourseSchedule.getType() == CourseScheduleType.MUSIC_NETWORK || newCourseSchedule.getType() == CourseScheduleType.HIGH){
 							Integer studentNum = classGroupStudentMapperDao.countClassGroupNormalStudentNum(ts.getClassGroupId());
+							if (studentNum > 5) {
+								studentNum = 5;
+							}
 							BigDecimal salary = JSON.parseObject(tdms.getSalaryRuleJson()).getBigDecimal(studentNum.toString());
 							if(Objects.isNull(salary)){
 								throw new BizException("请设置老师默认课酬");

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

@@ -517,7 +517,7 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 
 	@Override
 	public TeacherAttendance getTeacherPersonalAttendance(Integer courseScheduleId) {
-		return teacherAttendanceDao.getTeacherPersonalAttendance(courseScheduleId);
+		return teacherAttendanceDao.getMainTeacherAttendance(courseScheduleId);
 	}
 
 	@Override
@@ -589,7 +589,7 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 
 	@Override
 	public TeacherAttendanceDetailDto getTeacherPersonalAttendanceDetail(Integer courseScheduleId) {
-		TeacherAttendance teacherAttendance = teacherAttendanceDao.getTeacherPersonalAttendance(courseScheduleId);
+		TeacherAttendance teacherAttendance = teacherAttendanceDao.getMainTeacherAttendance(courseScheduleId);
 		CourseSchedule courseSchedule = courseScheduleDao.get(courseScheduleId.longValue());
 		TeacherAttendanceDetailDto result = new TeacherAttendanceDetailDto();
 		result.setStatus(courseSchedule.getStatus());

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

@@ -455,12 +455,11 @@
                 #{courseScheduleId}
             </foreach>
     </select>
-    <select id="getTeacherPersonalAttendance" resultMap="TeacherAttendance">
+    <select id="getMainTeacherAttendance" resultMap="TeacherAttendance">
         SELECT ta.*,s.longitude_latitude_ FROM teacher_attendance ta
         LEFT JOIN course_schedule cs ON ta.course_schedule_id_ = cs.id_
         LEFT JOIN school s ON cs.schoole_id_ = s.id_
-        WHERE ta.course_schedule_id_ = #{courseScheduleId}
-        LIMIT 1
+        WHERE ta.course_schedule_id_ = #{courseScheduleId} and ta.teacher_id_ = cs.actual_teacher_id_
     </select>
     <select id="getTotalMinutes" resultType="java.lang.Integer">
         SELECT ROUND((UNIX_TIMESTAMP(CONCAT(ta.sign_out_time_)) - UNIX_TIMESTAMP(CONCAT(cs.class_date_,' ',cs.start_class_time_))) / 60)