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

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

@@ -266,10 +266,10 @@ public class MarkStudentServiceImpl extends ServiceImpl<MarkStudentMapper, MarkS
 //            }
 
             // 扫描状态
-            if (ScanStatus.UNEXIST.equals(scoreDetailDto.getScanStatus())) {
-                scoreDetailDto.setStudentStatusDisplay(ScanStatus.UNEXIST.getName());
-            } else if (BasicExamStudentStatusEnum.M.equals(scoreDetailDto.getStudentStatus()) || scoreDetailDto.getAbsent() || scoreDetailDto.getOmrAbsent() || scoreDetailDto.getManualAbsent()) {
+            if (BasicExamStudentStatusEnum.M.equals(scoreDetailDto.getStudentStatus()) || scoreDetailDto.getAbsent() || scoreDetailDto.getOmrAbsent() || scoreDetailDto.getManualAbsent()) {
                 scoreDetailDto.setStudentStatusDisplay("缺考");
+            } else if (ScanStatus.UNEXIST.equals(scoreDetailDto.getScanStatus())) {
+                scoreDetailDto.setStudentStatusDisplay(ScanStatus.UNEXIST.getName());
             } else {
                 scoreDetailDto.setStudentStatusDisplay("正常");
             }
@@ -443,6 +443,9 @@ public class MarkStudentServiceImpl extends ServiceImpl<MarkStudentMapper, MarkS
         markStudent.setCourseId(courseId);
         markStudent.setCoursePaperId(coursePaperId);
         markStudent.setScanStatus(status);
+        if (ScanStatus.UNEXIST.equals(status)) {
+            markStudent.setManualAbsent(false);
+        }
         markStudent.setMarkPaperStatus(markPaperStatus.name());
         return baseMapper.selectCountByQuery(markStudent, dpr);
     }
@@ -1882,7 +1885,7 @@ public class MarkStudentServiceImpl extends ServiceImpl<MarkStudentMapper, MarkS
         markStudent.setExamId(examId);
         markStudent.setPaperNumber(paperNumber);
         markStudent.setScanStatus(ScanStatus.UNEXIST);
-        markStudent.setAbsent(false);
+        markStudent.setManualAbsent(false);
         markStudent.setMarkPaperStatus(MarkPaperStatus.FORMAL.name());
         return baseMapper.selectCountByQuery(markStudent, null);
     }