1、添加教务老师字段

2、布置作业

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

@@ -15,16 +15,14 @@ import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.thirdparty.message.MessageSenderPluginContext.MessageSender;
 import com.ym.mec.util.collection.MapUtil;
+import com.ym.mec.util.date.DateUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Service
@@ -74,9 +72,15 @@ public class CourseHomeworkServiceImpl extends BaseServiceImpl<Long, CourseHomew
 		}
 		if (count != 0) {
 			Map<String, List<TeacherHomeworkListDto>> collect = dataList.stream().collect(Collectors.groupingBy(TeacherHomeworkListDto::getDay));
-			for (String key : collect.keySet()) {
+			List<Date> dates=new ArrayList<>();
+			collect.keySet().forEach(ds-> dates.add(DateUtil.stringToDate(ds,"yyyy-MM-dd")));
+			dates.sort(Comparator.comparing(Date::getTime));
+			dates.sort(Comparator.reverseOrder());
+			for (Date date : dates) {
+				String key=DateUtil.dateToString(date, "yyyy-MM-dd");
 				Map<String, Object> r = new HashMap<>();
 				r.put("day", key);
+				collect.get(key).sort(Comparator.comparing(TeacherHomeworkListDto::getStartClassTime).reversed());
 				r.put("list", collect.get(key));
 				result.add(r);
 			}

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

@@ -324,6 +324,8 @@
             LEFT JOIN course_schedule cs ON cs.id_ = sch.course_schedule_id_
         WHERE sch.user_id_=#{userId}
         AND DATE_FORMAT(class_date_, '%Y-%m')=DATE_FORMAT(#{classDate}, '%Y-%m')
+        ORDER BY CONCAT(cs.class_date_,' ',cs.start_class_time_) DESC
+        <include refid="global.limit"/>
     </select>
     <select id="countStudentHomeworkRecord" resultType="int">
         SELECT