|
@@ -433,17 +433,21 @@ public class ScanOmrTaskServiceImpl extends ServiceImpl<ScanOmrTaskMapper, ScanO
|
|
if (list.isEmpty()) {
|
|
if (list.isEmpty()) {
|
|
throw ExceptionResultEnum.ERROR.exception("没有识别对照任务");
|
|
throw ExceptionResultEnum.ERROR.exception("没有识别对照任务");
|
|
}
|
|
}
|
|
- if(list.get(0).getStatus().equals(OmrTaskStatus.WAITING)&& this.apply(student, userId)){
|
|
|
|
- ScanOmrStudent scanOmrStudent = new ScanOmrStudent();
|
|
|
|
- scanOmrStudent.setCardNumber(student.getCardNumber());
|
|
|
|
- scanOmrStudent.setStudentCode(student.getStudentCode());
|
|
|
|
- scanOmrStudent.setStudentName(student.getStudentName());
|
|
|
|
- scanOmrStudent.setCourseCode(student.getCourseCode());
|
|
|
|
- scanOmrStudent.setCourseName(student.getCourseName());
|
|
|
|
- scanOmrStudent.setCoursePaperId(student.getCoursePaperId());
|
|
|
|
- scanOmrStudent.setCoursePaperNumber(student.getPaperNumber());
|
|
|
|
- scanOmrStudent.setTasks(toTaskVo(list));
|
|
|
|
- return scanOmrStudent;
|
|
|
|
|
|
+ if(list.get(0).getStatus().equals(OmrTaskStatus.WAITING)){
|
|
|
|
+ if(this.apply(student, userId)){
|
|
|
|
+ ScanOmrStudent scanOmrStudent = new ScanOmrStudent();
|
|
|
|
+ scanOmrStudent.setCardNumber(student.getCardNumber());
|
|
|
|
+ scanOmrStudent.setStudentCode(student.getStudentCode());
|
|
|
|
+ scanOmrStudent.setStudentName(student.getStudentName());
|
|
|
|
+ scanOmrStudent.setCourseCode(student.getCourseCode());
|
|
|
|
+ scanOmrStudent.setCourseName(student.getCourseName());
|
|
|
|
+ scanOmrStudent.setCoursePaperId(student.getCoursePaperId());
|
|
|
|
+ scanOmrStudent.setCoursePaperNumber(student.getPaperNumber());
|
|
|
|
+ scanOmrStudent.setTasks(toTaskVo(list));
|
|
|
|
+ return scanOmrStudent;
|
|
|
|
+ }else{
|
|
|
|
+ throw ExceptionResultEnum.ERROR.exception("识别对照任务被占用");
|
|
|
|
+ }
|
|
} else if(list.get(0).getStatus().equals(OmrTaskStatus.PROCESSED)&&list.get(0).getUserId().equals(userId)){
|
|
} else if(list.get(0).getStatus().equals(OmrTaskStatus.PROCESSED)&&list.get(0).getUserId().equals(userId)){
|
|
ScanOmrStudent scanOmrStudent = new ScanOmrStudent();
|
|
ScanOmrStudent scanOmrStudent = new ScanOmrStudent();
|
|
scanOmrStudent.setCardNumber(student.getCardNumber());
|
|
scanOmrStudent.setCardNumber(student.getCardNumber());
|