首页

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

@@ -8,6 +8,7 @@ import com.ibeetl.admin.core.util.enums.DelFlagEnum;
 import com.ibeetl.jlw.dao.*;
 import com.ibeetl.jlw.entity.*;
 import com.ibeetl.jlw.enums.ChatLogSendTypeEnum;
+import com.ibeetl.jlw.enums.GlobalPushStatusEnum;
 import com.ibeetl.jlw.enums.ResourcesQuestionSnapshotFromTypeEnum;
 import com.ibeetl.jlw.enums.SignInTypeEnum;
 import com.ibeetl.jlw.web.query.*;
@@ -225,16 +226,19 @@ public class StatisticalAnalysisService {
         //班级
         TeacherOpenCourseMergeSchoolClassQuery classQuery = new TeacherOpenCourseMergeSchoolClassQuery();
         classQuery.setTeacherOpenCourseId(teacherOpenCourseId);
+        classQuery.setTeacherOpenCourseMergeSchoolClassStatus(1);
         List<TeacherOpenCourseMergeSchoolClass> classList = teacherOpenCourseMergeSchoolClassService.getValues(classQuery);
         data.put("classNum", classList.size());
         //学生
         TeacherOpenCourseMergeStudentQuery studentQuery = new TeacherOpenCourseMergeStudentQuery();
         studentQuery.setTeacherOpenCourseId(teacherOpenCourseId);
+        studentQuery.setTeacherOpenCourseSchoolClassMergeStudentStatus(1);
         List<TeacherOpenCourseMergeStudent> studentList = teacherOpenCourseMergeStudentService.getValuesByQueryNotWithPermission(studentQuery);
         data.put("studentNum", studentList.size());
         //课件
         TeacherOpenCourseMergeCourseInfoQuery courseInfoQuery = new TeacherOpenCourseMergeCourseInfoQuery();
         courseInfoQuery.setTeacherOpenCourseId(teacherOpenCourseId);
+        courseInfoQuery.setCourseInfoStatus(1);
         List<TeacherOpenCourseMergeCourseInfo> courseInfos = teacherOpenCourseMergeCourseInfoService.getValuesByQueryNotWithPermission(courseInfoQuery);
         data.put("coursewareNum", courseInfos.size());
         //视频
@@ -243,6 +247,7 @@ public class StatisticalAnalysisService {
         //习题总数
         TeacherOpenCourseQuestionSettingQuery teacherOpenCourseQuestionSettingQuery = new TeacherOpenCourseQuestionSettingQuery();
         teacherOpenCourseQuestionSettingQuery.setTeacherOpenCourseId(teacherOpenCourseId);
+        teacherOpenCourseQuestionSettingQuery.setTeacherOpenCourseQuestionSettingPushStatus(GlobalPushStatusEnum.PUSH);
         teacherOpenCourseQuestionSettingQuery.setTeacherOpenCourseQuestionSettingStatus(1);
 
         List<TeacherOpenCourseQuestionSettingPure> courseQuestionSettings = teacherOpenCourseQuestionSettingDao.getValuesByQueryNotWithPermission(teacherOpenCourseQuestionSettingQuery, null);

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

@@ -56,11 +56,8 @@ public class TeacherOpenCourseKnowledgePointService extends CoreBaseService<Teac
             relationQuery.setTeacherOpenCourseKnowledgePointIdPlural(CollectionUtil.join(collect, ","));
             List<TeacherOpenCourseKnowledgePointRelation> openCourseKnowledgePointRelations = relationService.getValuesByQueryNotWithPermission(relationQuery);
             for (TeacherOpenCourseKnowledgePoint teacherOpenCourseKnowledgePoint : list) {
-                TeacherOpenCourseKnowledgePointRelation relation = openCourseKnowledgePointRelations.stream().filter(v ->
+                openCourseKnowledgePointRelations.stream().filter(v ->
-                        v.getTeacherOpenCourseKnowledgePointId().equals(teacherOpenCourseKnowledgePoint.getTeacherOpenCourseKnowledgePointId())).findFirst().orElse(null);
+                        v.getTeacherOpenCourseKnowledgePointId().equals(teacherOpenCourseKnowledgePoint.getTeacherOpenCourseKnowledgePointId())).findFirst().ifPresent(relation -> teacherOpenCourseKnowledgePoint.setHandsOnId(relation.getBussinessId()));
-                if (relation != null) {
-                    teacherOpenCourseKnowledgePoint.setHandsOnId(relation.getBussinessId());
-                }
             }
 
         }

web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseKnowledgePointQuery.java

@@ -36,6 +36,16 @@ public class TeacherOpenCourseKnowledgePointQuery extends PageParam {
     @Query(name = "是否删除 1删除，0未删除", display = false)
     private int delFlag;
 
+    private Long handsOnId;
+
+    public Long getHandsOnId() {
+        return handsOnId;
+    }
+
+    public void setHandsOnId(Long handsOnId) {
+        this.handsOnId = handsOnId;
+    }
+
     private String teacherOpenCourseKnowledgePointIdPlural;
     private String teacherOpenCourseIdPlural;
     private String chapterIdPlural;