|
@@ -1,5 +1,6 @@
|
|
|
package com.qmth.distributed.print.business.service.impl;
|
|
|
|
|
|
+import com.alibaba.fastjson.JSON;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
|
|
@@ -1739,6 +1740,13 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
|
|
|
List<ExamDetailList> examDetailLists = JSONObject.parseArray(JSONObject.toJSONString(examDetailParams.getList()), ExamDetailList.class);
|
|
|
int i = 1;
|
|
|
for (ExamDetailList examDetailList : examDetailLists) {
|
|
|
+ int count = examDetailList.getStudentCount();
|
|
|
+ String clazzName = examDetailList.getClassName();
|
|
|
+ if (count == 0){
|
|
|
+ throw ExceptionResultEnum.ERROR.exception("选择的考试班级【" + clazzName + "】下无学生,请确认该班级学生信息。");
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
SerialNumberParams serialNumberParams = new SerialNumberParams("packageCode-" + schoolId, "1", 6);
|
|
|
ExamDetail examDetail = new ExamDetail();
|
|
|
examDetail.setId(SystemConstant.getDbUuid());
|
|
@@ -1748,11 +1756,13 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
|
|
|
examDetail.setPrintPlanId(examPrintPlan.getId());
|
|
|
examDetail.setPrintPlanName(examPrintPlan.getName());
|
|
|
examDetail.setExamPlace(StringUtils.isBlank(examDetailList.getExamPlace()) ? "考点" + i : examDetailList.getExamPlace()); // 默认填充班级所在校区
|
|
|
- examDetail.setExamRoom(StringUtils.isBlank(examDetailList.getExamRoom()) ? examDetailList.getClassName() : examDetailList.getExamRoom()); // 默认填充班级
|
|
|
+ examDetail.setExamRoom(StringUtils.isBlank(examDetailList.getExamRoom()) ? clazzName : examDetailList.getExamRoom()); // 默认填充班级
|
|
|
examDetail.setStatus(ExamDetailStatusEnum.NEW);
|
|
|
examDetail.setExamStartTime(examDetailParams.getExamStartTime());
|
|
|
examDetail.setExamEndTime(examDetailParams.getExamEndTime());
|
|
|
- examDetail.setTotalSubjects(examDetailList.getStudentCount());
|
|
|
+
|
|
|
+
|
|
|
+ examDetail.setTotalSubjects(count);
|
|
|
examDetail.setExamDataSource(ExamDataSourceEnum.EXAM_TASK);
|
|
|
examDetail.setNormal(true);
|
|
|
examDetail.setPrintHouseId(examDetailList.getPrintHouseId());
|