浏览代码

bug修复

wangliang 4 年之前
父节点
当前提交
2630dbb26c

+ 2 - 5
teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/service/impl/ReportCommonServiceImpl.java

@@ -237,10 +237,8 @@ public class ReportCommonServiceImpl implements ReportCommonService {
      */
     @Override
     public List<SurveyTeacherGradeDistributionResult> surveyTeacherDistribution(Long examId, String courseCode, Long collegeId) {
+        List<SurveyTeacherGradeDistributionResult> surveyTeacherGradeDistributionResultList = new ArrayList<>();
         List<SurveyTeacherDistributionResult> surveyTeacherDistributionResultList = taExamCourseRecordService.surveyTeacherDistribution(examId, courseCode);
-        if (Objects.isNull(surveyTeacherDistributionResultList) || surveyTeacherDistributionResultList.size() == 0) {
-            return new ArrayList<>();
-        }
         surveyTeacherDistributionResultList = surveyTeacherDistributionResultList.stream().filter(e -> !e.getAbsent()).collect(Collectors.toList());
         //过滤应届
         List<SurveyTeacherDistributionResult> currentDistributionResultList = surveyTeacherDistributionResultList.stream().filter(e -> e.getStudentCurrent() == true && !e.getAbsent()).collect(Collectors.toList());
@@ -248,7 +246,6 @@ public class ReportCommonServiceImpl implements ReportCommonService {
         double currentTotalCount = currentDistributionResultList.size(); // 应届人数
 
         // 计算成绩分布图
-        List<SurveyTeacherGradeDistributionResult> surveyTeacherGradeDistributionResultList = new ArrayList<>();
         for (GradeScopeEnum value : GradeScopeEnum.values()) {
             String describe = value.getDescribe();
             double allCountBefore = 0, allCountAfter = 0, currentCountBefore = 0, currentCountAfter = 0,
@@ -525,7 +522,7 @@ public class ReportCommonServiceImpl implements ReportCommonService {
         tbExamCourseQueryWrapper.lambda().eq(TBExamCourse::getPublishStatus, PublishStatusEnum.PUBLISH);
         TBExamCourse tbExamCourse = tbExamCourseService.getOne(tbExamCourseQueryWrapper);
         if (Objects.isNull(tbExamCourse)) {
-            return null;
+            return new SurveyTeacherExamCourseResult();
         }
         TAExamCourse taExamCourse = taExamCourseService.getOne(taExamCourseQueryWrapper);
         BigDecimal bigDecimal = new BigDecimal(1);