update

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/service/impl/ExamStudentServiceImpl.java

@@ -259,11 +259,7 @@ public class ExamStudentServiceImpl extends BaseQueryService<ExamStudent> implem
 
     public ExamStudentSearchQuery findByQuery(final ExamStudentSearchQuery query) {
         checkQuery(query);
-        if (query.getSort() == null) {
-            query.orderById();
-        } else {
-            query.setSort(query.getSort().and(new Sort("id")));
-        }
+        query.addSort("id", Direction.ASC);
         if (query.getSheetCount() != null) {
             query.setSheetCount(query.getSheetCount() * 2);
         }
@@ -289,7 +285,7 @@ public class ExamStudentServiceImpl extends BaseQueryService<ExamStudent> implem
         ExamStudentSearchQuery query = new ExamStudentSearchQuery();
         query.setPageNumber(pageNumber);
         query.setPageSize(pageSize);
-        query.setSort(new Sort(Direction.ASC, "id"));
+        query.addSort("id", Direction.ASC);
         return studentDao.findByExamId(examId, query);
     }
 
@@ -298,7 +294,7 @@ public class ExamStudentServiceImpl extends BaseQueryService<ExamStudent> implem
         ExamStudentSearchQuery query = new ExamStudentSearchQuery();
         query.setPageNumber(pageNumber);
         query.setPageSize(pageSize);
-        query.setSort(new Sort(Direction.ASC, "id"));
+        query.addSort("id", Direction.ASC);
         return studentDao.findByExamIdAndSubjectCode(examId, subjectCode, query);
     }
 
@@ -308,7 +304,7 @@ public class ExamStudentServiceImpl extends BaseQueryService<ExamStudent> implem
         ExamStudentSearchQuery query = new ExamStudentSearchQuery();
         query.setPageNumber(pageNumber);
         query.setPageSize(pageSize);
-        query.setSort(new Sort(Direction.ASC, "id"));
+        query.addSort("id", Direction.ASC);
         return studentDao.findByExamIdAndUploadAndAbsent(examId, upload, absent, query);
     }
 
@@ -317,7 +313,7 @@ public class ExamStudentServiceImpl extends BaseQueryService<ExamStudent> implem
         ExamStudentSearchQuery query = new ExamStudentSearchQuery();
         query.setPageNumber(pageNumber);
         query.setPageSize(pageSize);
-        query.setSort(new Sort(Direction.ASC, "id"));
+        query.addSort("id", Direction.ASC);
         return studentDao.findByExamIdAndCampusName(examId, campusName, query);
     }
 
@@ -790,7 +786,7 @@ public class ExamStudentServiceImpl extends BaseQueryService<ExamStudent> implem
         ExamStudentSearchQuery query = new ExamStudentSearchQuery();
         query.setPageNumber(1);
         query.setPageSize(count);
-        query.setSort(new Sort(Direction.ASC, "id"));
+        query.addSort("id", Direction.ASC);
         return studentDao.findUnLibraryStudent(examId, subjectCode, groupNumber, query);
     }
 
@@ -1193,7 +1189,7 @@ public class ExamStudentServiceImpl extends BaseQueryService<ExamStudent> implem
         query.addStatus(SubjectiveStatus.UNMARK);
         query.setPageNumber(1);
         query.setPageSize(200);
-        query.setSort(new Sort(Direction.ASC, "uploadTime", "id"));
+        query.setSort(new Sort(Direction.ASC, "uploadTime"));
         List<ExamStudent> list = findByQuery(query).getResult();
         if (list.isEmpty()) {
             return null;

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/mark/query/TrialLibrarySearchQuery.java

@@ -23,10 +23,6 @@ public class TrialLibrarySearchQuery extends BaseQuery<TrialLibrary> {
         setSort(new Sort(Direction.ASC, "examNumber"));
     }
 
-    public void orderById() {
-        setSort(new Sort(Direction.ASC, "id"));
-    }
-
     public Integer getExamId() {
         return examId;
     }

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/mark/service/Impl/ArbitrateHistoryServiceImpl.java

@@ -12,6 +12,7 @@ import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Sort;
+import org.springframework.data.domain.Sort.Direction;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -70,11 +71,7 @@ public class ArbitrateHistoryServiceImpl extends BaseQueryService<ArbitrateHisto
     @Override
     public ArbitrateHistorySearchQuery findByQuery(final ArbitrateHistorySearchQuery query) {
         checkQuery(query);
-        if (query.getSort() == null) {
-            query.setSort(new Sort("id"));
-        } else {
-            query.setSort(query.getSort().and(new Sort("id")));
-        }
+        query.addSort("id", Direction.ASC);
         Page<ArbitrateHistory> result = historyDao.findAll(buildSpecification(query), query);
         fillResult(result, query);
         return query;

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/mark/service/Impl/MarkLibraryServiceImpl.java

@@ -13,6 +13,7 @@ import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Sort;
+import org.springframework.data.domain.Sort.Direction;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -89,11 +90,7 @@ public class MarkLibraryServiceImpl extends BaseQueryService<MarkLibrary> implem
     @Override
     public MarkLibrarySearchQuery findByQuery(final MarkLibrarySearchQuery query) {
         checkQuery(query);
-        if (query.getSort() == null) {
-            query.setSort(new Sort("id"));
-        } else {
-            query.setSort(query.getSort().and(new Sort("id")));
-        }
+        query.addSort("id", Direction.ASC);
         Page<MarkLibrary> result = libraryDao.findAll(buildSpecification(query), query);
         fillResult(result, query);
         return query;
@@ -277,6 +274,7 @@ public class MarkLibraryServiceImpl extends BaseQueryService<MarkLibrary> implem
     @Override
     public MarkLibrarySearchQuery findHistory(MarkLibrarySearchQuery query) {
         checkQuery(query);
+        query.addSort("id", Direction.ASC);
         Page<MarkLibrary> result = libraryDao.findAll(buildHistotySpecification(query), query);
         fillResult(result, query);
         return query;

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/mark/service/Impl/TrialServiceImpl.java

@@ -51,13 +51,14 @@ public class TrialServiceImpl extends BaseQueryService<TrialLibrary> implements
         TrialLibrarySearchQuery query = new TrialLibrarySearchQuery();
         query.setPageNumber(pageNumber);
         query.setPageSize(pageSize);
-        query.orderById();
+        query.addSort("id", Direction.ASC);
         return libraryDao.findUnMarked(examId, subjectCode, groupNumber, query);
     }
 
     @Override
     public TrialLibrarySearchQuery findLibrary(final TrialLibrarySearchQuery query) {
         checkQuery(query);
+        query.addSort("id", Direction.ASC);
         Page<TrialLibrary> result = libraryDao.findAll(buildSpecification(query), query);
         fillResult(result, query);
         return query;

stmms-web/src/main/java/cn/com/qmth/stmms/admin/exam/StudentController.java

@@ -91,7 +91,6 @@ public class StudentController extends BaseExamController {
         if (query.getBatchCode() != null) {
             query.setBatchCode(StringUtils.upperCase(query.getBatchCode()));
         }
-        query.orderById();
         query = studentService.findByQuery(query);
         if (query.getCurrentCount() > 0) {
             for (ExamStudent student : query.getResult()) {
@@ -334,7 +333,6 @@ public class StudentController extends BaseExamController {
             query.setPageNumber(1);
             query.setPageSize(Integer.MAX_VALUE);
             query.setExamId(examId);
-            query.orderById();
             query = studentService.findByQuery(query);
             for (ExamStudent student : query.getResult()) {
                 ExamSubject subject = subjectService.find(student.getExamId(), student.getSubjectCode());

stmms-web/src/main/java/cn/com/qmth/stmms/admin/exam/TrialController.java

@@ -105,7 +105,6 @@ public class TrialController extends BaseExamController {
         List<MarkGroup> groupList = groupService.findByExamAndSubjectAndStatus(examId, query.getSubjectCode(),
                 MarkStatus.TRIAL);
         if (!groupList.isEmpty()) {
-            query.orderById();
             query = trialService.findLibrary(query);
             for (TrialLibrary library : query.getResult()) {
                 if (library.getMarkerId() != null) {