3.3.4 update

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

@@ -231,7 +231,6 @@ public class TRExamStudentServiceImpl extends ServiceImpl<TRExamStudentMapper, T
         // 各科目达成度
         List<StudentCourseRequirement> studentCourseRequirementList = new ArrayList<>();
         for (StudentCourseInfoDto studentCourseInfoDto : studentCourseInfoDtoList) {
-            System.out.println(JSON.toJSONString(studentCourseInfoDto.getCourseTargetRequirementList()));
             StudentCourseRequirement studentCourseRequirement = new StudentCourseRequirement();
             studentCourseRequirement.setCourseCode(studentCourseInfoDto.getCourseCode());
             studentCourseRequirement.setCourseName(studentCourseInfoDto.getCourseName());
@@ -262,7 +261,9 @@ public class TRExamStudentServiceImpl extends ServiceImpl<TRExamStudentMapper, T
         ObeCourseRequirementReport obeCourseRequirementReport = obeCourseRequirementReportService.findByCultureProgramId(cultureProgramId);
         if (obeCourseRequirementReport != null) {
             ObeCourseRequirementDto obeCourseRequirementDto = JSON.parseObject(obeCourseRequirementReport.getRequirementRadar(), ObeCourseRequirementDto.class);
-            requirementDegreeMap = obeCourseRequirementDto.getObeRequirements().stream().collect(Collectors.toMap(ObeRequirementDto::getName, ObeRequirementDto::getMatrixDegree));
+            for (ObeRequirementDto obeRequirement : obeCourseRequirementDto.getObeRequirements()) {
+                requirementDegreeMap.put(obeRequirement.getName(), obeRequirement.getMatrixDegree());
+            }
         }
 
         Map<String, List<CourseTargetRequirement>> stringDoubleMap = courseTargetRequirementListAll.stream().collect(Collectors.groupingBy(m -> m.getRequirementSortNum() + "##" + m.getRequirementName()));
@@ -273,7 +274,7 @@ public class TRExamStudentServiceImpl extends ServiceImpl<TRExamStudentMapper, T
             studentTotalRequirement.setRequirementName(keys[1]);
             studentTotalRequirement.setRequirementSortNum(Integer.valueOf(keys[0]));
             if (requirementDegreeMap.containsKey(keys[1])) {
-                studentTotalRequirement.setProfessionalDegree(requirementDegreeMap.get(keys[1]).doubleValue());
+                studentTotalRequirement.setProfessionalDegree(requirementDegreeMap.get(keys[1]) != null ?requirementDegreeMap.get(keys[1]).doubleValue() : null);
             }
             studentTotalRequirementList.add(studentTotalRequirement);
         }