Merge remote-tracking branch 'origin/release_v3.3.4' into release_v3.3.4

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/result/report/studentRequirement/CourseTargetRequirement.java

@@ -10,15 +10,17 @@ public class CourseTargetRequirement {
     private Long requirementId;
     private String requirementName;
     private Integer requirementSortNum;
+    private String requirementContent;
     private Double courseTargetDegree;
 
     public CourseTargetRequirement() {
     }
 
-    public CourseTargetRequirement(Long subRequirementId, String subRequirementName, Integer subRequirementSortNum, Long requirementId, String requirementName, Integer requirementSortNum, Double scale) {
+    public CourseTargetRequirement(Long subRequirementId, String subRequirementName, Integer subRequirementSortNum, String requirementContent, Long requirementId, String requirementName, Integer requirementSortNum, Double scale) {
         this.subRequirementId = subRequirementId;
         this.subRequirementName = subRequirementName;
         this.subRequirementSortNum = subRequirementSortNum;
+        this.requirementContent = requirementContent;
         this.requirementId = requirementId;
         this.requirementName = requirementName;
         this.requirementSortNum = requirementSortNum;
@@ -88,4 +90,12 @@ public class CourseTargetRequirement {
     public void setCourseTargetDegree(Double courseTargetDegree) {
         this.courseTargetDegree = courseTargetDegree;
     }
+
+    public String getRequirementContent() {
+        return requirementContent;
+    }
+
+    public void setRequirementContent(String requirementContent) {
+        this.requirementContent = requirementContent;
+    }
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/result/report/studentRequirement/StudentCourseRequirementDetail.java

@@ -8,6 +8,7 @@ public class StudentCourseRequirementDetail {
     private String requirementName;
     // 排序
     private Integer requirementSortNum;
+    private String requirementContent;
     // 学生个人达成度
     private Double studentDegree;
 
@@ -16,9 +17,10 @@ public class StudentCourseRequirementDetail {
     public StudentCourseRequirementDetail() {
     }
 
-    public StudentCourseRequirementDetail(Integer requirementSortNum, String requirementName, Double studentDegree) {
+    public StudentCourseRequirementDetail(Integer requirementSortNum, String requirementName, String requirementContent, Double studentDegree) {
         this.requirementName = requirementName;
         this.requirementSortNum = requirementSortNum;
+        this.requirementContent = requirementContent;
         this.studentDegree = studentDegree;
     }
 
@@ -53,4 +55,12 @@ public class StudentCourseRequirementDetail {
     public void setSubRequirementDetailList(List<StudentCourseRequirementDetail> subRequirementDetailList) {
         this.subRequirementDetailList = subRequirementDetailList;
     }
+
+    public String getRequirementContent() {
+        return requirementContent;
+    }
+
+    public void setRequirementContent(String requirementContent) {
+        this.requirementContent = requirementContent;
+    }
 }

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

@@ -242,8 +242,8 @@ public class TRExamStudentServiceImpl extends ServiceImpl<TRExamStudentMapper, T
             List<StudentCourseRequirementDetail> requirementDetailList = new ArrayList<>();
             for (Map.Entry<String, List<CourseTargetRequirement>> entry : map.entrySet()) {
                 String[] s = entry.getKey().split("##");
-                StudentCourseRequirementDetail studentCourseRequirementDetail = new StudentCourseRequirementDetail(Integer.valueOf(s[0]), s[1], null);
-                studentCourseRequirementDetail.setSubRequirementDetailList(entry.getValue().stream().map(m -> new StudentCourseRequirementDetail(m.getSubRequirementSortNum(), m.getSubRequirementName(), m.getCourseTargetDegree())).collect(Collectors.toList()));
+                StudentCourseRequirementDetail studentCourseRequirementDetail = new StudentCourseRequirementDetail(Integer.valueOf(s[0]), s[1], null, null);
+                studentCourseRequirementDetail.setSubRequirementDetailList(entry.getValue().stream().map(m -> new StudentCourseRequirementDetail(m.getSubRequirementSortNum(), m.getSubRequirementName(), m.getRequirementContent(), m.getCourseTargetDegree())).collect(Collectors.toList()));
                 requirementDetailList.add(studentCourseRequirementDetail);
             }
             requirementDetailList.sort(Comparator.comparingInt(StudentCourseRequirementDetail::getRequirementSortNum));
@@ -288,7 +288,7 @@ public class TRExamStudentServiceImpl extends ServiceImpl<TRExamStudentMapper, T
         for (CourseRequirementMatrixDto courseRequirementMatrixDto : requirementMatrixDtoList) {
             for (MatrixRequirementDto requirement : courseRequirementMatrixDto.getRequirements()) {
                 for (MatrixSubRequirementDto subRequirement : requirement.getSubRequirements()) {
-                    courseTargetRequirementList.add(new CourseTargetRequirement(subRequirement.getSubRequirementId(), subRequirement.getName(), subRequirement.getSubRequirementSortNum(), requirement.getId(), requirement.getName(), requirement.getSortNum(), subRequirement.getScale().doubleValue() != 0 ? subRequirement.getScale().doubleValue() : null));
+                    courseTargetRequirementList.add(new CourseTargetRequirement(subRequirement.getSubRequirementId(), subRequirement.getName(), subRequirement.getSubRequirementSortNum(), subRequirement.getContent(), requirement.getId(), requirement.getName(), requirement.getSortNum(), subRequirement.getScale().doubleValue() != 0 ? subRequirement.getScale().doubleValue() : null));
                 }
             }
         }