Merge remote-tracking branch 'origin/dev_v3.1.0' into dev_v3.1.0

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

@@ -336,6 +336,9 @@ public class ExamPaperStructureServiceImpl extends ServiceImpl<ExamPaperStructur
                 .eq(ExamTaskDetail::getExamTaskId, examTaskId)).getCardId();
         String jpgAttachmentInfo = examCardDetailService.getOne(new QueryWrapper<ExamCardDetail>().lambda()
                 .eq(ExamCardDetail::getCardId, cardId)).getJpgAttachmentInfo();
+        if(StringUtils.isBlank(jpgAttachmentInfo)){
+            return new ArrayList<>();
+        }
 
         List<ConvertJpgStorage> convertJpgStorageList = JSONObject.parseArray(jpgAttachmentInfo, ConvertJpgStorage.class);
 

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

@@ -38,7 +38,7 @@
                 union all select id,teach_clazz_name clazz_name from teach_clazz where school_id = #{schoolId} ) bc on
             bc.id = tsess.clazz_id
         join exam_student es on
-            es.school_id = tsess.school_id and es.student_code = tsess.student_code
+            es.school_id = tsess.school_id and es.ticket_number = tsess.exam_number and es.student_code = tsess.student_code
         left join basic_major bm on
             bm.id = tsess.major_id
         left join sys_org so on