|
@@ -685,6 +685,9 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
|
|
examTask.setExamId(examId);
|
|
examTask.setExamId(examId);
|
|
examTask.setCardRuleId(cardRuleId);
|
|
examTask.setCardRuleId(cardRuleId);
|
|
|
|
|
|
|
|
+ String sequence = printCommonService.createCourseSequence(schoolId, examTask.getCourseCode());
|
|
|
|
+ examTask.setSequence(sequence);
|
|
|
|
+
|
|
if (StringUtils.isNotBlank(userMap.get("paperNumber"))) {
|
|
if (StringUtils.isNotBlank(userMap.get("paperNumber"))) {
|
|
if (paperNumbers.contains(userMap.get("paperNumber"))) {
|
|
if (paperNumbers.contains(userMap.get("paperNumber"))) {
|
|
// 试卷编号在文件内重复,跳过
|
|
// 试卷编号在文件内重复,跳过
|
|
@@ -703,9 +706,6 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
|
|
// 试卷编号生成规则:年月日(例如:20100419)+0000(例如:0001)顺序编号
|
|
// 试卷编号生成规则:年月日(例如:20100419)+0000(例如:0001)顺序编号
|
|
String paperNumber = printCommonService.createPaperNumber(schoolId);
|
|
String paperNumber = printCommonService.createPaperNumber(schoolId);
|
|
userMap.put("paperNumber", paperNumber);
|
|
userMap.put("paperNumber", paperNumber);
|
|
-
|
|
|
|
- String sequence = printCommonService.createCourseSequence(schoolId, courseCode);
|
|
|
|
- userMap.put("sequence", sequence);
|
|
|
|
}
|
|
}
|
|
examTask.setPaperNumber(userMap.get("paperNumber"));
|
|
examTask.setPaperNumber(userMap.get("paperNumber"));
|
|
examTask.setSequence(userMap.get("sequence"));
|
|
examTask.setSequence(userMap.get("sequence"));
|