|
@@ -35,7 +35,6 @@ import com.qmth.distributed.print.business.util.PdfUtil;
|
|
|
import com.qmth.teachcloud.common.bean.dto.AssignTeacherDto;
|
|
|
import com.qmth.teachcloud.common.bean.dto.BlurryUserDto;
|
|
|
import com.qmth.teachcloud.common.bean.dto.DataPermissionRule;
|
|
|
-import com.qmth.teachcloud.common.bean.marking.ConvertJpgStorage;
|
|
|
import com.qmth.teachcloud.common.bean.result.SysUserResult;
|
|
|
import com.qmth.teachcloud.common.bean.result.TbTaskDetailResult;
|
|
|
import com.qmth.teachcloud.common.bean.sync.ExamTaskDataVo;
|
|
@@ -887,6 +886,11 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
|
|
|
examTaskDetailService.deleteByExamTaskId(examTaskApplyPram.getExamTaskId());
|
|
|
// 新建试卷
|
|
|
List<ExamTaskDetail> examTaskDetailList = examTaskApplyPram.getExamTaskDetailList();
|
|
|
+ if (CollectionUtils.isNotEmpty(examTaskDetailList)) {
|
|
|
+ if (examTaskDetailList.size() % 2 != 0) {
|
|
|
+ throw ExceptionResultEnum.ERROR.exception("请至少上传2份试卷");
|
|
|
+ }
|
|
|
+ }
|
|
|
for (ExamTaskDetail examTaskDetail : examTaskDetailList) {
|
|
|
validSubmitParam(examTaskDetail, basicPrintConfig.getPrintContent(), examTaskApplyPram.getOpenAb());
|
|
|
// 已曝光试卷和未曝光试卷赋值(新增时,已曝光试卷为null,未曝光试卷为paper_type)
|
|
@@ -1222,6 +1226,13 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
|
|
|
SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
|
|
|
|
|
|
ExamTaskSubmitContent examTaskSubmitContent = JSON.parseObject(examTaskSubmitPram.getExamTaskContent(), ExamTaskSubmitContent.class);
|
|
|
+
|
|
|
+ if (Objects.nonNull(examTaskSubmitContent) &&
|
|
|
+ CollectionUtils.isNotEmpty(examTaskSubmitContent.getExamTaskDetailList())) {
|
|
|
+ if (examTaskSubmitContent.getExamTaskDetailList().size() % 2 != 0) {
|
|
|
+ throw ExceptionResultEnum.ERROR.exception("请至少上传2份试卷");
|
|
|
+ }
|
|
|
+ }
|
|
|
// 新建命题任务
|
|
|
ExamTask examTask = examTaskSubmitContent.getExamTask();
|
|
|
BasicPrintConfig basicPrintConfig = basicPrintConfigService.getByExamId(examTask.getExamId());
|