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

stmms-ms-marking/src/main/java/cn/com/qmth/stmms/ms/marking/service/MarkingService.java

@@ -117,14 +117,9 @@ public class MarkingService {
         long leftCount = markTasks.stream().filter(i -> i.getResult() == null).count();
         if (leftCount == 0) {
             MarkTask[] sources = new MarkTask[markTasks.size()];
-            int[] values = markTasks.stream().mapToInt(MarkTask::getLevelValue).toArray();
-            boolean result = ArbitrationService.arbitrate(markingConfig.getDeviation(), values);
-            if (result) {
-                //仲裁
-                paper.arbitrate();
-            } else {
-                //定档
-                DeterResult determine = determineLevelService.determine(markingConfig.isMajority(), markTasks.toArray(sources));
+            //定档
+            DeterResult determine = determineLevelService.determine(markingConfig.isMajority(), markTasks.toArray(sources));
+            if (Objects.nonNull(determine) && Objects.nonNull(determine.getResult())) {
                 paper.determineLevel(determine.getResult());
                 if (determine.getDeterType() == DetermineLevelService.DeterType.WEIGHT) {
                     paper.setMarkedLogic(true);
@@ -156,6 +151,13 @@ public class MarkingService {
                         }
                     }
                 }
+            } else {
+                int[] values = markTasks.stream().mapToInt(MarkTask::getLevelValue).toArray();
+                boolean result = ArbitrationService.arbitrate(markingConfig.getDeviation(), values);
+                if (result) {
+                    //仲裁
+                    paper.arbitrate();
+                }
             }
             paperRepo.save(paper);
         }