3.2.5 多套卷型时，抽卷卷型错误

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/SyncExamTaskDto.java

@@ -27,6 +27,7 @@ public class SyncExamTaskDto {
     private String examTime;
     private Integer totalSubjects;
     private Integer thirdRelateId;
+    private String thirdRelateName;
     private ExamTaskSyncStatusEnum syncStatus;
     private String syncStatusDisplay;
     private String errorMsg;
@@ -149,6 +150,14 @@ public class SyncExamTaskDto {
         return thirdRelateId;
     }
 
+    public String getThirdRelateName() {
+        return thirdRelateName;
+    }
+
+    public void setThirdRelateName(String thirdRelateName) {
+        this.thirdRelateName = thirdRelateName;
+    }
+
     public void setThirdRelateId(Integer thirdRelateId) {
         this.thirdRelateId = thirdRelateId;
     }

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

@@ -304,12 +304,10 @@ public class TaskLogicServiceImpl implements TaskLogicService {
 
                     //拼装key
                     StringJoiner stringJoiner = new StringJoiner("_");
-                    stringJoiner.add(String.valueOf(examDetail.getSchoolId()))
-                            .add(String.valueOf(examPrintPlan.getExamId()))
-//                            .add(String.valueOf(examDetail.getExamStartTime()))
-//                            .add(String.valueOf(examDetail.getExamEndTime()))
-                            .add(examDetailCourse.getCourseCode())
-                            .add(examDetailCourse.getPaperNumber());
+                    stringJoiner.add(String.valueOf(examPrintPlan.getId()))
+                            .add(examDetailCourse.getPaperNumber())
+                            .add(String.valueOf(examDetail.getExamStartTime()))
+                            .add(String.valueOf(examDetail.getExamEndTime()));
                     String key = stringJoiner.toString();
 
                     String paperType;
@@ -329,12 +327,12 @@ public class TaskLogicServiceImpl implements TaskLogicService {
 
                     // 当前关联试卷类型
                     List<String> relatePaperTypes = new ArrayList<>();
-                    if (StringUtils.isNotBlank(examTaskDetail.getRelatePaperType())) {
-                        String[] strings = examTaskDetail.getRelatePaperType().split(",");
-                        if (strings.length > 0) {
-                            relatePaperTypes.addAll(Arrays.asList(strings));
-                        }
-                    }
+//                    if (StringUtils.isNotBlank(examTaskDetail.getRelatePaperType())) {
+//                        String[] strings = examTaskDetail.getRelatePaperType().split(",");
+//                        if (strings.length > 0) {
+//                            relatePaperTypes.addAll(Arrays.asList(strings));
+//                        }
+//                    }
 
                     // 考生实际关联试卷类型
                     List<String> studentPaperTypes = new ArrayList<>();

distributed-print-business/src/main/resources/mapper/ExamDetailCourseMapper.xml

@@ -161,6 +161,7 @@
             t.total_subjects totalSubjects,
             t.print_plan_ids printPlanIds,
             ets.third_relate_id thirdRelateId,
+            tsse.exam_name thirdRelateName,
             ets.sync_status syncStatus,
             su.real_name syncUserName,
             bc.teaching_room_id teachingRoomId,
@@ -240,6 +241,9 @@
                 AND et.paper_number = ets.paper_number
                 AND t.paper_type = ets.total_paper_type
                 LEFT JOIN
+            t_sync_stmms_exam tsse ON ets.school_id = tsse.school_id
+                and ets.third_relate_id = tsse.exam_id
+                LEFT JOIN
             sys_user su ON ets.sync_user_id = su.id
                 LEFT JOIN
             basic_course bc ON et.school_id = bc.school_id