Browse Source

美术阅卷11月新增需求-修复BUG

wangliang 5 years ago
parent
commit
a1535654ec

+ 1 - 3
stmms-ms-marking/src/main/java/cn/com/qmth/stmms/ms/marking/api/MarkTaskApi.java

@@ -120,9 +120,7 @@ public class MarkTaskApi {
         });
         if (stage == MarkStage.SCORE && level == null) {
             Collections.sort(markTaskDTOs, (MarkTaskDTO a, MarkTaskDTO b) -> a.getLevel().compareTo(b.getLevel()));
-        }
-        long count = markTaskDTOs.stream().filter(o -> Objects.nonNull(o.getUpdatedOn())).count();
-        if (count != markTaskDTOs.size()) {
+        } else if (stage == MarkStage.LEVEL && Objects.isNull(level)) {
             Collections.sort(markTaskDTOs, Comparator.comparing(MarkTaskDTO::getRandomSeqNew));
         }
         return new PageableDTO(markTaskDTOs, markTasks.getTotalElements(), markTasks.getTotalPages(), pageable.getPageNumber());