代码优化

themis-business/src/main/java/com/qmth/themis/business/service/impl/TIeReportServiceImpl.java

@@ -1,7 +1,6 @@
 package com.qmth.themis.business.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qmth.themis.business.bean.admin.*;
 import com.qmth.themis.business.cache.bean.ExamCacheBean;
@@ -111,11 +110,7 @@ public class TIeReportServiceImpl implements TIeReportService {
         if (absentActivityIds.size() == 0) {
             return new Page<>(pageNumber, pageSize);
         }
-
-        Page<ExamDeficiencyListBean> ipage = new Page<>(pageNumber, pageSize);
-        ipage.addOrder(OrderItem.asc("t.exam_activity_id"));
-        ipage.addOrder(OrderItem.asc("t.room_code"));
-        return examStudentMapper.getExamDeficiencyPage(ipage, examId, examActivityId,
+        return examStudentMapper.getExamDeficiencyPage(new Page<>(pageNumber, pageSize), examId, examActivityId,
                 roomCode, courseCode, name, identity, absentActivityIds);
     }
 
@@ -123,9 +118,7 @@ public class TIeReportServiceImpl implements TIeReportService {
     public IPage<ExamExceptionListBean> examExceptionList(Long examId, Long examActivityId, String roomCode, String courseCode, String name,
                                                           String identity, int pageNumber, int pageSize) {
         TBUser tbUser = (TBUser) ServletUtil.getRequestAccount();
-        Page<ExamExceptionListBean> ipage = new Page<>(pageNumber, pageSize);
-        ipage.addOrder(OrderItem.asc("f.exam_student_id"));
-        return invigilateExceptionInfoMapper.getExamExceptionPage(ipage, tbUser.getOrgId(), examId,
+        return invigilateExceptionInfoMapper.getExamExceptionPage(new Page<>(pageNumber, pageSize), tbUser.getOrgId(), examId,
                 examActivityId, roomCode, courseCode, name, identity);
     }
 
@@ -138,9 +131,7 @@ public class TIeReportServiceImpl implements TIeReportService {
     public IPage<ExamReexamListBean> examReexamList(Long examId, Long examActivityId, String roomCode, String courseCode, String name,
                                                     String identity, int pageNumber, int pageSize) {
         TBUser tbUser = (TBUser) ServletUtil.getRequestAccount();
-        Page<ExamReexamListBean> ipage = new Page<>(pageNumber, pageSize);
-        ipage.addOrder(OrderItem.asc("f.exam_student_id"));
-        return examReexamMapper.getExamReexamPage(ipage, tbUser.getOrgId(), examId, examActivityId, roomCode,
+        return examReexamMapper.getExamReexamPage(new Page<>(pageNumber, pageSize), tbUser.getOrgId(), examId, examActivityId, roomCode,
                 courseCode, name, identity);
     }
 
@@ -148,9 +139,7 @@ public class TIeReportServiceImpl implements TIeReportService {
     public IPage<ExamBreachListBean> examBreachList(Long examId, Long examActivityId, String roomCode, String courseCode, String name,
                                                     String identity, int pageNumber, int pageSize) {
         TBUser tbUser = (TBUser) ServletUtil.getRequestAccount();
-        Page<ExamBreachListBean> ipage = new Page<>(pageNumber, pageSize);
-        ipage.addOrder(OrderItem.asc("f.exam_student_id"));
-        return examBreachLogMapper.getExamBreachPage(ipage, tbUser.getOrgId(), examId, examActivityId, roomCode,
+        return examBreachLogMapper.getExamBreachPage(new Page<>(pageNumber, pageSize), tbUser.getOrgId(), examId, examActivityId, roomCode,
                 courseCode, name, identity);
     }
 
@@ -163,9 +152,7 @@ public class TIeReportServiceImpl implements TIeReportService {
     public IPage<ExamBreachListBean> examRevokeBreachList(Long examId, Long examActivityId, String roomCode, String courseCode,
                                                           String name, String identity, int pageNumber, int pageSize) {
         TBUser tbUser = (TBUser) ServletUtil.getRequestAccount();
-        Page<ExamBreachListBean> ipage = new Page<>(pageNumber, pageSize);
-        ipage.addOrder(OrderItem.asc("f.exam_student_id"));
-        return examBreachLogMapper.getExamRevokeBreachPage(ipage, tbUser.getOrgId(), examId, examActivityId,
+        return examBreachLogMapper.getExamRevokeBreachPage(new Page<>(pageNumber, pageSize), tbUser.getOrgId(), examId, examActivityId,
                 roomCode, courseCode, name, identity);
     }
 
@@ -178,9 +165,7 @@ public class TIeReportServiceImpl implements TIeReportService {
     public IPage<ExamStudentLogListBean> examStudentLogList(Long examId, Long examActivityId, String roomCode, String courseCode,
                                                             String name, String identity, int pageNumber, int pageSize) {
         TBUser tbUser = (TBUser) ServletUtil.getRequestAccount();
-        Page<ExamStudentLogListBean> ipage = new Page<>(pageNumber, pageSize);
-        ipage.addOrder(OrderItem.asc("t.id"));
-        return examStudentMapper.getPageForStudentLog(ipage, tbUser.getOrgId(), examId, examActivityId,
+        return examStudentMapper.getPageForStudentLog(new Page<>(pageNumber, pageSize), tbUser.getOrgId(), examId, examActivityId,
                 roomCode, courseCode, name, identity);
     }
 

themis-business/src/main/resources/mapper/TEExamBreachLogMapper.xml

@@ -44,6 +44,7 @@
 		<if test="name != null and name != ''">
 			and t.name like concat(#{name},'%')
 		</if>
+        order by f.exam_student_id
 	</select>
 
 	<select id="getExamRevokeBreachPage"
@@ -88,6 +89,7 @@
 		<if test="name != null and name != ''">
 			and t.name like concat(#{name},'%')
 		</if>
+        order by f.exam_student_id
 	</select>
 
 	<select id="getExamBreachDetailList"

themis-business/src/main/resources/mapper/TEExamReexamMapper.xml

@@ -269,6 +269,6 @@
             and t.name like concat(#{name},'%')
         </if>
         GROUP BY f.exam_student_id
-        order by t.room_code
+        order by f.exam_student_id
     </select>
 </mapper>

themis-business/src/main/resources/mapper/TEExamStudentMapper.xml

@@ -297,7 +297,7 @@
         <if test="name != null and name != ''">
             and t.name like concat(#{name},'%')
         </if>
-        order by t.exam_id
+        order by t.exam_activity_id,t.room_code
     </select>
 
     <select id="getPageForStudentLog"
@@ -330,7 +330,7 @@
         <if test="name != null and name != ''">
             and t.name like concat(#{name},'%')
         </if>
-        order by t.exam_id
+        order by t.id
     </select>
 
     <update id="updateAlreadyExamCount">