|
|
@@ -116,7 +116,7 @@
|
|
|
<if test="dto.reportTimeStart != null and dto.reportTimeEnd != null">
|
|
|
and t1.report_time between #{dto.reportTimeStart} and #{dto.reportTimeEnd}
|
|
|
</if>
|
|
|
- ORDER BY t1.report_time IS NULL DESC, t1.report_time DESC
|
|
|
+ ORDER BY t1.report_time IS NULL DESC, t1.report_time DESC,t5.name
|
|
|
</select>
|
|
|
<select id="getPlanPageList" parameterType="com.xjrsoft.module.student.dto.StudentReportRecordPageDto" resultType="com.xjrsoft.module.student.vo.StudentReportRecordPlanPageVo">
|
|
|
SELECT t1.id, t1.user_id, t4.name AS grade_name,t5.name AS class_name,t6.name AS teacher_name,
|
|
|
@@ -177,7 +177,7 @@
|
|
|
<if test="dto.reportTimeStart != null and dto.reportTimeEnd != null">
|
|
|
and t1.report_time between #{dto.reportTimeStart} and #{dto.reportTimeEnd}
|
|
|
</if>
|
|
|
- ORDER BY t1.report_time IS NULL DESC, t1.report_time DESC
|
|
|
+ ORDER BY t1.report_time IS NULL DESC, t1.report_time DESC,t5.name
|
|
|
</select>
|
|
|
<select id="getStatisticsDataList" parameterType="com.xjrsoft.module.student.dto.StudentReportRecordStatisticsDto"
|
|
|
resultType="com.xjrsoft.module.student.vo.StudentReportRecordStatisticsListVo">
|