Merge branch 'dev_v3.2.1' into dev_v3.2.2

merge

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ExamTaskServiceImpl.java

@@ -338,6 +338,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
                             examTask.getUserId(),
                             true);
                     map = activitiService.customFlowStart(map);
+                    flowId = SystemConstant.convertIdToLong((String) map.get(SystemConstant.FLOW_ID));
                     map.computeIfAbsent(SystemConstant.FLOW_JOIN_TYPE, v -> FlowJoinTypeEnum.NEW);
                     tfFlowJoinService.saveOrUpdate(map);
                 } else {
@@ -685,6 +686,9 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
             examTask.setExamId(examId);
             examTask.setCardRuleId(cardRuleId);
 
+            String sequence = printCommonService.createCourseSequence(schoolId, examTask.getCourseCode());
+            examTask.setSequence(sequence);
+
             if (StringUtils.isNotBlank(userMap.get("paperNumber"))) {
                 if (paperNumbers.contains(userMap.get("paperNumber"))) {
                     // 试卷编号在文件内重复，跳过
@@ -703,12 +707,8 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
                 // 试卷编号生成规则：年月日（例如：20100419）+0000（例如：0001）顺序编号
                 String paperNumber = printCommonService.createPaperNumber(schoolId);
                 userMap.put("paperNumber", paperNumber);
-
-                String sequence = printCommonService.createCourseSequence(schoolId, courseCode);
-                userMap.put("sequence", sequence);
             }
             examTask.setPaperNumber(userMap.get("paperNumber"));
-            examTask.setSequence(userMap.get("sequence"));
             examTask.setPaperNumberId(SystemConstant.getDbUuid());
             examTask.setStartTime(task.getStartTime());
             examTask.setEndTime(task.getEndTime());