update sort

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

@@ -11,7 +11,6 @@ import javax.persistence.criteria.Root;
 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.Direction;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -70,7 +69,6 @@ public class ArbitrateHistoryServiceImpl extends BaseQueryService<ArbitrateHisto
     @Override
     public ArbitrateHistorySearchQuery findByQuery(final ArbitrateHistorySearchQuery query) {
         checkQuery(query);
-        query.addSort("examNumber", Direction.ASC);
         Page<ArbitrateHistory> result = historyDao.findAll(buildSpecification(query), query);
         fillResult(result, query);
         return query;

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

@@ -132,7 +132,7 @@ public class ArbitrateController extends BaseExamController {
                 group.setQuestionList(questionService.findByExamAndSubjectAndObjectiveAndGroupNumber(query.getExamId(),
                         group.getSubjectCode(), false, group.getNumber()));
             }
-            query.orderByIdDesc();
+            query.addSort("examNumber", Direction.ASC);
             query = arbitrateService.findByQuery(query);
             for (ArbitrateHistory history : query.getResult()) {
                 if (history.getUserId() != null) {
@@ -267,9 +267,11 @@ public class ArbitrateController extends BaseExamController {
             d = Direction.ASC;
         }
         if (order.equals("markerTime")) {
-            querySort = new Sort(d, "updateTime", "examNumber");
+            querySort = new Sort(d, "updateTime");
         } else if (order.equals("markerScore")) {
-            querySort = new Sort(d, "totalScore", "examNumber");
+            querySort = new Sort(d, "totalScore").and(new Sort(Direction.DESC, "updateTime"));
+        } else {
+            querySort = new Sort(Direction.DESC, "updateTime");
         }
         MarkGroup group = groupService.findOne(examId, subjectCode, groupNumber);
         List<Task> list = new LinkedList<Task>();
@@ -284,11 +286,7 @@ public class ArbitrateController extends BaseExamController {
             query.setStartScroe(0.0);
             query.setPageNumber(pageNumber);
             query.setPageSize(pageSize);
-            if (querySort != null) {
-                query.setSort(querySort);
-            } else {
-                query.orderByUpdateTimeDesc();
-            }
+            query.setSort(querySort);
             query = arbitrateService.findByQuery(query);
             for (ArbitrateHistory history : query.getResult()) {
                 Task task = taskService.build(history, group);
@@ -323,6 +321,7 @@ public class ArbitrateController extends BaseExamController {
             query.setStatus(HistoryStatus.WAITING);
             query.setPageNumber(1);
             query.setPageSize(10);
+            query.addSort("examNumber", Direction.ASC);
             while (true) {
                 query = arbitrateService.findByQuery(query);
                 if (query.getCurrentCount() == 0) {