|
@@ -538,7 +538,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
|
|
|
|
|
|
// 校验状态,可能被撤回
|
|
// 校验状态,可能被撤回
|
|
ExamTask examTask = this.getById(taskReviewLog.getExamTaskId());
|
|
ExamTask examTask = this.getById(taskReviewLog.getExamTaskId());
|
|
- if (ExamStatusEnum.SUBMIT.equals(examTask.getStatus())) {
|
|
|
|
|
|
+ if (!ExamStatusEnum.SUBMIT.equals(examTask.getStatus())) {
|
|
throw ExceptionResultEnum.ERROR.exception("当前状态不能审核");
|
|
throw ExceptionResultEnum.ERROR.exception("当前状态不能审核");
|
|
}
|
|
}
|
|
|
|
|
|
@@ -693,7 +693,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
|
|
examTaskDetail.setId(detail.getId());
|
|
examTaskDetail.setId(detail.getId());
|
|
// 已曝光试卷和未曝光试卷赋值
|
|
// 已曝光试卷和未曝光试卷赋值
|
|
examTaskDetail.setExposedPaperType(detail.getExposedPaperType());
|
|
examTaskDetail.setExposedPaperType(detail.getExposedPaperType());
|
|
- examTaskDetail.setUnexposedPaperType(detail.getUnexposedPaperType());
|
|
|
|
|
|
+ examTaskDetail.setUnexposedPaperType(examTaskDetail.getPaperType());
|
|
} else {
|
|
} else {
|
|
// 已曝光试卷和未曝光试卷赋值(新增时,已曝光试卷为null,未曝光试卷为paper_type)
|
|
// 已曝光试卷和未曝光试卷赋值(新增时,已曝光试卷为null,未曝光试卷为paper_type)
|
|
examTaskDetail.setUnexposedPaperType(examTaskDetail.getPaperType());
|
|
examTaskDetail.setUnexposedPaperType(examTaskDetail.getPaperType());
|