1

web/src/main/java/com/ibeetl/jlw/service/StatisticalAnalysisService.java

@@ -91,11 +91,14 @@ public class StatisticalAnalysisService {
         data.put("studentNum", studentList.size());
         //学习通过率
         List<TeacherOpenCourseScoreDashboard> scoreDashboards = teacherOpenCourseScoreDashboardDao.createLambdaQuery().andEq(TeacherOpenCourseScoreDashboard::getTeacherOpenCourseId, teacherOpenCourseId).select();
-        long count1 = scoreDashboards.stream().filter(v ->
+        if (CollectionUtil.isNotEmpty(scoreDashboards)) {
-                "不及格".equals(v.getLastStatus()) || "E".equals(v.getLastStatus())).count();
+            long count1 = scoreDashboards.stream().filter(v ->
-        long l = scoreDashboards.size() - count1;
+                    "不及格".equals(v.getLastStatus()) || "E".equals(v.getLastStatus())).count();
-
+            long l = scoreDashboards.size() - count1;
-        data.put("passRate", NumberUtil.formatPercent(NumberUtil.div(l,scoreDashboards.size()), 0));
+            data.put("passRate", NumberUtil.formatPercent(NumberUtil.div(l,scoreDashboards.size()), 0));
+        }else {
+            data.put("passRate", "0%");
+        }
         //授课视频
         TeacherOpenCourseMergeCourseInfoQuery courseInfoQuery = new TeacherOpenCourseMergeCourseInfoQuery();
         courseInfoQuery.setTeacherOpenCourseId(teacherOpenCourseId);
@@ -337,11 +340,14 @@ public class StatisticalAnalysisService {
         List<TeacherOpenCourseQuestionSettingPure> courseQuestionSettings = teacherOpenCourseQuestionSettingDao.getValuesByQueryNotWithPermission2(teacherOpenCourseQuestionSettingQuery);
         List<Long> collect2 = courseQuestionSettings.stream()
                 .map(TeacherOpenCourseQuestionSettingPure::getTeacherOpenCourseQuestionSettingId).collect(Collectors.toList());
-        List<QuestionLogSummary> select1 = questionLogSummaryDao.createLambdaQuery()
+        List<QuestionLogSummary> select1 = new ArrayList<>();
-                .andIsNotNull(QuestionLogSummary::getQuestionLogSummaryStudentTotalScore)
+        if(CollectionUtil.isNotEmpty(collect2)) {
-                .andIn(QuestionLogSummary::getQuestionSettingId, collect2)
+            select1 = questionLogSummaryDao.createLambdaQuery()
-                .andEq(QuestionLogSummary::getQuestionLogSummaryStatus, 1)
+                    .andIsNotNull(QuestionLogSummary::getQuestionLogSummaryStudentTotalScore)
-                .select();
+                    .andIn(QuestionLogSummary::getQuestionSettingId, collect2)
+                    .andEq(QuestionLogSummary::getQuestionLogSummaryStatus, 1)
+                    .select();
+        }
         //批改作业数
         data.put("homeWorkNumber", select1.size());
         //课程学习