3.3.4 update

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

@@ -12,6 +12,7 @@ public class CourseRequirementMatrixDto extends ObeCourseRequirementMatrix {
     private int requirementSortNum;
     private int subRequirementSortNum;
     private String requirementContent;
+    private String semesterName;
     // 是否可编辑
     private Boolean canEdit;
     private List<MatrixRequirementDto> requirements;
@@ -56,6 +57,14 @@ public class CourseRequirementMatrixDto extends ObeCourseRequirementMatrix {
         this.subRequirementSortNum = subRequirementSortNum;
     }
 
+    public String getSemesterName() {
+        return semesterName;
+    }
+
+    public void setSemesterName(String semesterName) {
+        this.semesterName = semesterName;
+    }
+
     public List<MatrixRequirementDto> getRequirements() {
         return requirements;
     }

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

@@ -491,13 +491,13 @@ public class ExamCardServiceImpl extends ServiceImpl<ExamCardMapper, ExamCard> i
                     // 试卷类型不匹配跳过
                     continue;
                 }
-                String jpgAttachmentInfo = this.getOne(new QueryWrapper<ExamCard>().lambda()
-                        .eq(ExamCard::getId, paperInfoVo.getCardId())).getJpgAttachment();
-                if (StringUtils.isBlank(jpgAttachmentInfo)) {
+                ExamCard examCard = this.getOne(new QueryWrapper<ExamCard>().lambda()
+                        .eq(ExamCard::getId, paperInfoVo.getCardId()));
+                if (examCard == null || StringUtils.isBlank(examCard.getJpgAttachment())) {
                     return new ArrayList<>();
                 }
 
-                List<ConvertJpgStorage> convertJpgStorageList = JSONObject.parseArray(jpgAttachmentInfo, ConvertJpgStorage.class);
+                List<ConvertJpgStorage> convertJpgStorageList = JSONObject.parseArray(examCard.getJpgAttachment(), ConvertJpgStorage.class);
 
                 cardJpgResultList.addAll(convertJpgStorageList.stream().flatMap(e -> {
                     BasicAttachment basicAttachment = basicAttachmentService.getById(e.getAttachmentId());

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

@@ -84,6 +84,7 @@ public class ObeCourseRequirementMatrixServiceImpl extends ServiceImpl<ObeCourse
                 matrixDto.setCourseCode(basicCourse.getCode());
                 matrixDto.setCourseName(basicCourse.getName());
                 matrixDto.setCanEdit(canEditCourse || finalCodeList.contains(basicCourse.getCode()));
+                matrixDto.setSemesterName(entry.getValue().get(0).getSemesterName());
                 List<MatrixRequirementDto> matrixRequirementDtoList = new ArrayList<>();
                 LinkedMultiValueMap<Long, CourseRequirementMatrixDto> requirementMap = new LinkedMultiValueMap<>();
                 for (CourseRequirementMatrixDto tpMatrix : entry.getValue()) {

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

@@ -23,7 +23,8 @@
             ocpc.sort_num courseSortNum,
             ocpr.sort_num requirementSortNum,
             socpr.sort_num subRequirementSortNum,
-            socpr.content requirementContent
+            socpr.content requirementContent,
+            bs.name semesterName
         FROM
             obe_course_requirement_matrix ocrm
                 LEFT JOIN
@@ -34,6 +35,10 @@
             obe_culture_program_requirement socpr ON ocrm.obe_sub_requirement_id = socpr.id
                 LEFT JOIN
             basic_course bc ON ocpc.course_id = bc.id
+                LEFT JOIN
+            obe_course_outline oco ON ocpc.culture_program_id = oco.culture_program_id AND ocpc.course_id = oco.course_id
+                LEFT JOIN
+            basic_semester bs ON oco.semester_id = bs.id
         WHERE
             ocrm.culture_program_id = #{cultureProgramId}
             <if test="courseId != null">