Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/TeacherIncomeReviewDto.java

@@ -30,6 +30,8 @@ public class TeacherIncomeReviewDto {
 
     private Double attendanceRange;
 
+    private Double vipAttendanceRange;
+
     public Double getAttendanceRange() {
         return attendanceRange;
     }
@@ -38,6 +40,14 @@ public class TeacherIncomeReviewDto {
         this.attendanceRange = attendanceRange;
     }
 
+    public Double getVipAttendanceRange() {
+        return vipAttendanceRange;
+    }
+
+    public void setVipAttendanceRange(Double vipAttendanceRange) {
+        this.vipAttendanceRange = vipAttendanceRange;
+    }
+
     public int getComplaintsDaysRange() {
         return complaintsDaysRange;
     }

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

@@ -2081,6 +2081,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
         }
 
         teacherSalaryOverview.setAttendanceRange(attendanceRange);
+        teacherSalaryOverview.setVipAttendanceRange(vipAttendanceRange);
 
         return teacherSalaryOverview;
     }

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

@@ -3797,7 +3797,7 @@
             course_schedule cs
             LEFT JOIN course_schedule_teacher_salary csts ON csts.course_schedule_id_ = cs.id_
         <include refid="queryTeacherCourseCondition"></include>
-        ORDER BY cs.class_date_,cs.start_class_time_,cs.id_ DESC
+        ORDER BY cs.class_date_ DESC,cs.start_class_time_ DESC,cs.id_ DESC
         <include refid="global.limit" />
     </select>