已布置训练排序修改，未回复的放在前面

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

@@ -245,7 +245,7 @@
 	</select>
 	<select id="findExtraExercilsesHomeworks" resultMap="ExtracurricularExercisesHomeworkListDto">
 		SELECT * FROM (
-		SELECT ee.id_, ee.create_time_,'EXERCISES' type_
+		SELECT ee.id_, ee.create_time_,'EXERCISES' type_,eer.extracurricular_exercises_id_ exercises_id_
 		FROM extracurricular_exercises ee
 		LEFT JOIN (SELECT DISTINCT extracurricular_exercises_id_ FROM extracurricular_exercises_reply WHERE is_replied_ = 0) eer
 		ON eer.extracurricular_exercises_id_ = ee.id_
@@ -258,9 +258,9 @@
 				AND DATE_FORMAT(create_time_, '%Y-%m') = DATE_FORMAT(#{createTime}, '%Y-%m')
 			</if>
 		</where>
-		ORDER BY eer.extracurricular_exercises_id_ DESC
 		UNION ALL
-		SELECT ch.id_,ch.create_time_,'HOMEWORK' type_ FROM course_homework ch
+		SELECT ch.id_,ch.create_time_,'HOMEWORK' type_,sch.course_homework_id_ exercises_id_
+		FROM course_homework ch
 		LEFT JOIN course_schedule_teacher_salary csts ON ch.course_schedule_id_ = csts.course_schedule_id_ AND csts.teacher_role_ = 'BISHOP'
 		LEFT JOIN (SELECT DISTINCT course_homework_id_ FROM student_course_homework WHERE is_replied_ = 0) sch ON sch.course_homework_id_ = ch.id_
 		<where>
@@ -274,9 +274,8 @@
 			<if test="createTime!=null">
 				AND DATE_FORMAT(ch.create_time_,'%Y-%m')=DATE_FORMAT(#{createTime}, '%Y-%m')
 			</if>
-		</where>
-		ORDER BY sch.course_homework_id_ DESC ) h
-		ORDER BY h.create_time_ DESC
+		</where>) h
+		ORDER BY h.exercises_id_ DESC,h.create_time_ DESC
 		<include refid="global.limit"/>
 	</select>
 	<select id="findByIdList" resultMap="com.ym.mec.biz.dal.dao.CourseHomeworkDao.teacherHomeworkListDto">