|
@@ -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,10 @@ 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.setMissScan(false);
|
|
|
+ }
|
|
|
markStudent.setMarkPaperStatus(markPaperStatus.name());
|
|
|
return baseMapper.selectCountByQuery(markStudent, dpr);
|
|
|
}
|