Merge remote-tracking branch 'origin/dev_v3.3.0' into dev_v3.3.0

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/impl/MarkStudentServiceImpl.java

@@ -268,7 +268,7 @@ public class MarkStudentServiceImpl extends ServiceImpl<MarkStudentMapper, MarkS
         student.setIncomplete(false);
         student.setAssigned(false);
         student.setQuestionFilled(false);
-        student.setOmrAbsent(false);
+//        student.setOmrAbsent(false);
         int paperCount = 0;
         List<ScanStudentPaper> studentPaperList = studentPaperService.findByStudentId(studentId);
         List<String> objectiveAnswers = new ArrayList<>();

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/impl/ScanOmrTaskServiceImpl.java

@@ -434,12 +434,14 @@ public class ScanOmrTaskServiceImpl extends ServiceImpl<ScanOmrTaskMapper, ScanO
     }
 
     private List<String> getStringItem(OmrTaskItem item) {
+        //只取最新的值
         List<String> value = new ArrayList<>();
-        value.add(item.getOmrResult());
-        if (item.getFirstResult() != null && item.getSecondResult() == null) {
-            value.add(item.getFirstResult());
-        } else if (item.getSecondResult() != null) {
+        if (item.getSecondResult() != null) {
             value.add(item.getSecondResult());
+        }else if (item.getFirstResult() != null && item.getSecondResult() == null) {
+            value.add(item.getFirstResult());
+        }else{
+            value.add(item.getOmrResult());
         }
         return value;
     }