|
@@ -224,13 +224,16 @@ public class ExamAuditController extends ControllerSupport {
|
|
|
//原需求:已经生成了评卷任务,不能重新审为不通过,但是可以审核为已通过
|
|
|
//20191220,需求临时调整:已经生成了评卷任务,均不可重审
|
|
|
//20200923,需求调整,恢复至原需求:已经生成了评卷任务,不能重新审为不通过,但是可以审核为已通过
|
|
|
- String markingTaskBuilt =
|
|
|
- ExamCacheTransferHelper.getDefaultCachedExamProperty(examId, ExamProperties.MARKING_TASK_BUILDED.name()).getValue();
|
|
|
- if (StringUtils.isNotBlank(markingTaskBuilt) && Constants.isTrue.equals(markingTaskBuilt)) {
|
|
|
- if (!redoAuditInfo.getIsPass()) {
|
|
|
- throw new StatusException("redoAudit-005", "该考试评卷任务已生成,不允许重审");
|
|
|
+ if(redoAuditInfo.getSkip() == null || !redoAuditInfo.getSkip()){
|
|
|
+ String markingTaskBuilt =
|
|
|
+ ExamCacheTransferHelper.getDefaultCachedExamProperty(examId, ExamProperties.MARKING_TASK_BUILDED.name()).getValue();
|
|
|
+ if (StringUtils.isNotBlank(markingTaskBuilt) && Constants.isTrue.equals(markingTaskBuilt)) {
|
|
|
+ if (!redoAuditInfo.getIsPass()) {
|
|
|
+ throw new StatusException("redoAudit-005", "该考试评卷任务已生成,不允许重审");
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
examAuditService.redoAudit(redoAuditInfo, user);
|
|
|
StringBuilder sb = new StringBuilder();
|
|
|
sb.append("考试记录ID:" + redoAuditInfo.getExamRecordDataIds().get(0));
|