|
@@ -391,20 +391,10 @@ public class MarkStudentServiceImpl extends ServiceImpl<MarkStudentMapper, MarkS
|
|
|
valueList.add(s.getCourseCode());
|
|
|
valueList.add(s.getCourseName());
|
|
|
// 扫描状态
|
|
|
- if (ScanStatus.UNEXIST.equals(s.getScanStatus())) {
|
|
|
- valueList.add(ScanStatus.UNEXIST.getName());
|
|
|
- } else if (BasicExamStudentStatusEnum.M.equals(s.getStudentStatus()) || s.getAbsent() || s.getOmrAbsent() || s.getManualAbsent()) {
|
|
|
- valueList.add("缺考");
|
|
|
- } else {
|
|
|
- valueList.add("正常");
|
|
|
- }
|
|
|
+ valueList.add(s.getStudentStatusDisplay());
|
|
|
|
|
|
// 违纪状态
|
|
|
- if (BasicExamStudentStatusEnum.B.equals(s.getStudentStatus()) || s.getBreach() || s.getOmrBreach() || s.getManualBreach()) {
|
|
|
- valueList.add("违纪");
|
|
|
- } else {
|
|
|
- valueList.add("");
|
|
|
- }
|
|
|
+ valueList.add(s.getBreachDisplay());
|
|
|
valueList.add(s.getObjectiveScore() == null ? "" : s.getObjectiveScore().toString());
|
|
|
valueList.add(s.getSubjectiveScore() == null ? "" : s.getSubjectiveScore().toString());
|
|
|
valueList.add(s.getTotalScore() == null ? "" : s.getTotalScore().toString());
|