|
@@ -2035,7 +2035,9 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, StudentEntity> i
|
|
|
Long pageSize, User user) {
|
|
|
IPage<AnswerQueryVo> result = this.baseMapper.getAssignedCheckTaskHistory(new Page<>(pageNumber, pageSize),
|
|
|
examId, subjectCode, user.getId());
|
|
|
+ SubjectEntity subject = subjectService.findByExamIdAndCode(examId,subjectCode);
|
|
|
for (AnswerQueryVo t : result.getRecords()) {
|
|
|
+ t.setSubjectName(subject.getName());
|
|
|
t = toTaskVo(t);
|
|
|
}
|
|
|
return PageUtil.of(result);
|
|
@@ -2055,6 +2057,7 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, StudentEntity> i
|
|
|
} else {
|
|
|
checkCount = 1;
|
|
|
}
|
|
|
+ SubjectEntity subject = subjectService.findByExamIdAndCode(examId,subjectCode);
|
|
|
while (task == null) {
|
|
|
IPage<AnswerQueryVo> list = this.findUnCheck(examId, subjectCode, checkCount, retry, 20);
|
|
|
if (list.getRecords().isEmpty()) {
|
|
@@ -2063,6 +2066,7 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, StudentEntity> i
|
|
|
for (AnswerQueryVo t : list.getRecords()) {
|
|
|
StudentEntity student = this.getById(t.getId());
|
|
|
if (this.apply(student, user.getAccount())) {
|
|
|
+ t.setSubjectName(subject.getName());
|
|
|
task = toTaskVo(t);
|
|
|
break;
|
|
|
}
|