From fc71d37776378e6968b2237928467bb9558f95cc Mon Sep 17 00:00:00 2001
From: xuliangtong <1124839262@qq.com>
Date: Fri, 24 Feb 2023 21:22:17 +0800
Subject: [PATCH] 1

---
 .../service/StatisticalAnalysisService.java   | 26 ++++++++++++-------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/web/src/main/java/com/ibeetl/jlw/service/StatisticalAnalysisService.java b/web/src/main/java/com/ibeetl/jlw/service/StatisticalAnalysisService.java
index 94db0238..e28041fa 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/StatisticalAnalysisService.java
+++ b/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 ->
-                "不及格".equals(v.getLastStatus()) || "E".equals(v.getLastStatus())).count();
-        long l = scoreDashboards.size() - count1;
-
-        data.put("passRate", NumberUtil.formatPercent(NumberUtil.div(l,scoreDashboards.size()), 0));
+        if (CollectionUtil.isNotEmpty(scoreDashboards)) {
+            long count1 = scoreDashboards.stream().filter(v ->
+                    "不及格".equals(v.getLastStatus()) || "E".equals(v.getLastStatus())).count();
+            long l = scoreDashboards.size() - count1;
+            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()
-                .andIsNotNull(QuestionLogSummary::getQuestionLogSummaryStudentTotalScore)
-                .andIn(QuestionLogSummary::getQuestionSettingId, collect2)
-                .andEq(QuestionLogSummary::getQuestionLogSummaryStatus, 1)
-                .select();
+        List<QuestionLogSummary> select1 = new ArrayList<>();
+        if(CollectionUtil.isNotEmpty(collect2)) {
+            select1 = questionLogSummaryDao.createLambdaQuery()
+                    .andIsNotNull(QuestionLogSummary::getQuestionLogSummaryStudentTotalScore)
+                    .andIn(QuestionLogSummary::getQuestionSettingId, collect2)
+                    .andEq(QuestionLogSummary::getQuestionLogSummaryStatus, 1)
+                    .select();
+        }
         //批改作业数
         data.put("homeWorkNumber", select1.size());
         //课程学习