update sort

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

@@ -273,7 +273,6 @@ public class MarkLibraryServiceImpl extends BaseQueryService<MarkLibrary> implem
     @Override
     public MarkLibrarySearchQuery findHistory(MarkLibrarySearchQuery query) {
         checkQuery(query);
-        query.addSort("examNumber", 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

@@ -77,7 +77,7 @@ public class TrialServiceImpl extends BaseQueryService<TrialLibrary> implements
         if (sort != null) {
             query.setSort(sort);
         } else {
-            query.setSort(new Sort(Direction.DESC, "markerTime", "id"));
+            query.setSort(new Sort(Direction.DESC, "markerTime"));
         }
         if (markerScore != null) {
             return libraryDao.findByExamIdAndSubjectCodeAndGroupNumberAndMarkerIdAndMarkerScore(examId, subjectCode,
@@ -137,7 +137,7 @@ public class TrialServiceImpl extends BaseQueryService<TrialLibrary> implements
         if (sort != null) {
             query.setSort(sort);
         } else {
-            query.setSort(new Sort(Direction.DESC, "markerTime", "id"));
+            query.setSort(new Sort(Direction.DESC, "markerTime"));
         }
         return libraryDao.findByExamIdAndSubjectCodeAndGroupNumberAndMarkerIdAndSecretNumber(examId, subjectCode,
                 groupNumber, markerId, secretNumber, query);

stmms-web/src/main/java/cn/com/qmth/stmms/mark/MarkController.java

@@ -579,9 +579,11 @@ public class MarkController extends BaseController {
             d = Direction.ASC;
         }
         if (order.equals("markerTime")) {
-            querySort = new Sort(d, "markerTime", "id");
+            querySort = new Sort(d, "markerTime");
         } else if (order.equals("markerScore")) {
-            querySort = new Sort(d, "markerScore", "id");
+            querySort = new Sort(d, "markerScore").and(new Sort(Direction.DESC, "markerTime"));
+        } else {
+            querySort = new Sort(Direction.DESC, "markerTime");
         }
         MarkGroup group = groupService.findOne(marker.getExamId(), marker.getSubjectCode(), marker.getGroupNumber());
         Exam exam = examService.findById(marker.getExamId());
@@ -595,11 +597,7 @@ public class MarkController extends BaseController {
             query.addStatus(LibraryStatus.INSPECTED);
             query.setGroupNumber(marker.getGroupNumber());
             query.setStartScore(0.0);
-            if (querySort != null) {
-                query.setSort(querySort);
-            } else {
-                query.orderByMarkerTimeDesc();
-            }
+            query.setSort(querySort);
             if (StringUtils.isNotBlank(secretNumber) && exam.getRemarkCount() != null) {
                 query.setPageNumber(1);
                 query.setPageSize(exam.getRemarkCount());