成绩管理1对多

distributed-print/src/main/java/com/qmth/distributed/print/api/obe/TRBasicInfoController.java

@@ -159,7 +159,7 @@ public class TRBasicInfoController {
                             && tcPaperStruct.getDimensionSign().longValue()
                             != obeCourseWeightResult.getDimensionSign().longValue());
         } else {
-            List<TRBasicInfo> trBasicInfoFilterList = trBasicInfoList.stream().filter(s -> Objects.nonNull(s.getTeachClassName()) && (Objects.equals(s.getTeachClassName(), SystemConstant.ALL) || Objects.equals(s.getTeachClassName().trim(), ""))).collect(Collectors.toList());
+            List<TRBasicInfo> trBasicInfoFilterList = trBasicInfoList.stream().filter(s -> Objects.nonNull(s.getTeachClassName()) && Objects.equals(s.getTeachClassName(), SystemConstant.ALL)).collect(Collectors.toList());
             if (!CollectionUtils.isEmpty(trBasicInfoFilterList)) {
                 trBasicInfoList.clear();
                 trBasicInfoList.addAll(trBasicInfoFilterList);

teachcloud-obe/src/main/java/com/qmth/teachcloud/obe/service/impl/ObeCourseRequirementReportServiceImpl.java

@@ -177,7 +177,7 @@ public class ObeCourseRequirementReportServiceImpl extends ServiceImpl<ObeCourse
             for (CourseRequirementMatrixDto c : courseRequirementMatrixDtoList) {
                 if (c.getCourseId().longValue() == basicCourse.getId().longValue()) {
                     List<TRBasicInfo> trBasicInfoList = trBasicInfoService.queryBasicInfo(obeCourseOutline.getCultureProgramId(), obeCourseOutline.getCourseId(), null, examId);
-                    TRBasicInfo trBasicInfo = !CollectionUtils.isEmpty(trBasicInfoList) ? trBasicInfoList.stream().filter(s -> Objects.nonNull(s.getTeachClassName()) && (Objects.equals(s.getTeachClassName(), SystemConstant.ALL) || Objects.equals(s.getTeachClassName().trim(), ""))).collect(Collectors.toList()).get(0) : null;
+                    TRBasicInfo trBasicInfo = !CollectionUtils.isEmpty(trBasicInfoList) ? trBasicInfoList.stream().filter(s -> Objects.nonNull(s.getTeachClassName()) && Objects.equals(s.getTeachClassName(), SystemConstant.ALL)).collect(Collectors.toList()).get(0) : null;
                     if (Objects.nonNull(trBasicInfo)) {
                         ReportCourseEvaluationResultDto reportCourseEvaluationResultDto = Objects.nonNull(trBasicInfo.getCourseEvaluationResult()) ? JSONObject.parseObject(trBasicInfo.getCourseEvaluationResult(), ReportCourseEvaluationResultDto.class) : null;
                         BigDecimal courseMatrixDegree = new BigDecimal(0);