Merge remote-tracking branch 'origin/master'

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

@@ -24,8 +24,18 @@ public class TeacherIncomeDto extends CourseSchedule {
 
     private Boolean belongToDaya;
 
+    private long sortNum;
+
     private List<TeacherSalaryDeductReasonDto> deductReasons;
 
+    public long getSortNum() {
+        return sortNum;
+    }
+
+    public void setSortNum(long sortNum) {
+        this.sortNum = sortNum;
+    }
+
     public BigDecimal getExpectIncome() {
         return expectIncome;
     }

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

@@ -2196,10 +2196,11 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
                     teacherIncomeInfo.getTeacherAttendance().setSchoolLongitudeLatitude(school.getLongitudeLatitude());
                 }
                 teacherIncomeInfo.setBelongToDaya(teacherSalary.getBelongToDaya());
+                teacherIncomeInfo.setSortNum(courseSchedule.getStartClassTime().getTime()+courseSchedule.getId());
                 dataList.add(teacherIncomeInfo);
             }
         }
-        dataList.sort(Comparator.comparing(TeacherIncomeDto::getId).reversed());
+        dataList.sort(Comparator.comparing(TeacherIncomeDto::getSortNum).reversed());
         pageInfo.setRows(dataList);
         return pageInfo;
     }

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.id_ DESC
+        ORDER BY cs.class_date_,cs.start_class_time_,cs.id_ DESC
         <include refid="global.limit" />
     </select>