diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/conf/CacheConfig.java b/admin-core/src/main/java/com/ibeetl/admin/core/conf/CacheConfig.java index a20a82b9..0fca8a99 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/conf/CacheConfig.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/conf/CacheConfig.java @@ -222,9 +222,9 @@ public class CacheConfig extends CachingConfigurerSupport { } else { // 二级缓存取 wrapper = redisCache.get(key); - if (wrapper != null) { - local.put(key, wrapper); - } +// if (wrapper != null) { +// local.put(key, wrapper); +// } return wrapper; } diff --git a/web/src/main/java/com/ibeetl/jlw/entity/vo/ResourcesCourseInfoAuthDetailsVO.java b/web/src/main/java/com/ibeetl/jlw/entity/vo/ResourcesCourseInfoAuthDetailsVO.java index dea42e5e..60483d80 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/vo/ResourcesCourseInfoAuthDetailsVO.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/vo/ResourcesCourseInfoAuthDetailsVO.java @@ -90,17 +90,16 @@ public class ResourcesCourseInfoAuthDetailsVO extends BaseEntity { " course_info t\n" + " LEFT JOIN resources_application_course ta on ta.course_info_id = t.course_info_id\n" + " LEFT JOIN universities_colleges_jurisdiction_curriculum_resources tb ON tb.course_info_id = t.course_info_id\n" + + " LEFT JOIN course_label td ON td.course_label_id = t.course_label_id\n" + + " WHERE\n" + + " 1\n" + " AND tb.use_type != 0\n" + " AND tb.use_type IS NOT NULL\n" + " @if(!isEmpty(orgId) && orgId != 1) { \n" + // 查询 超管上传的和自己上传的理论课程类的 - " \tAND find_in_set(ifnull(tb.org_id, 1), #'1,' + orgId#) \n" + + " \tAND tb.org_id = #orgId# \n" + " @} \n" + " AND ( now() BETWEEN tb.use_start_time AND tb.use_end_time )\n" + - " LEFT JOIN course_label td ON td.course_label_id = t.course_label_id\n" + - " AND td.course_label_status = 1\n" + - " WHERE\n" + - " 1\n" + " AND t.course_info_status = 1\n" + " AND t.course_info_type = 1\n" + " AND FIND_IN_SET(td.course_label_type, '理论课程类')") 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 435f5635..d3db32f3 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/StatisticalAnalysisService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/StatisticalAnalysisService.java @@ -373,9 +373,9 @@ public class StatisticalAnalysisService { List courseQuestionSettings = teacherOpenCourseQuestionSettingDao.getValuesByQueryNotWithPermission2(teacherOpenCourseQuestionSettingQuery); // 学生做题:读取【文档存档】中所有课程的【章节】、【课程实操】、【作业—题库作业】、【考试】,这几个模块的任务数量 - List questionSettingIdList = courseQuestionSettings.stream().map(item -> item.getTeacherOpenCourseQuestionSettingId()).collect(Collectors.toList()); - long allQuestionSettingNumber = resourcesQuestionSnapshotDao.createLambdaQuery().andIn(ResourcesQuestionSnapshot::getTeacherOpenCourseQuestionSettingId, questionSettingIdList) - .count(); +// List questionSettingIdList = courseQuestionSettings.stream().map(item -> item.getTeacherOpenCourseQuestionSettingId()).collect(Collectors.toList()); +// long allQuestionSettingNumber = resourcesQuestionSnapshotDao.createLambdaQuery().andIn(ResourcesQuestionSnapshot::getTeacherOpenCourseQuestionSettingId, questionSettingIdList) +// .count(); long homeWorkNumber = courseQuestionSettings.stream().filter(item -> !HOMEWORK_FILE.equals(item.getTeacherOpenCourseQuestionSettingType())).count(); @@ -388,8 +388,8 @@ public class StatisticalAnalysisService { long count = teacherOpenCourseHandsOnSimulationTasks.stream().filter(v -> "1".equals(v.getTaskType()) || "2".equals(v.getTaskType())).count(); data.put("studyNumber", count); - //学生做题 课程实操。学生做题:读取【文档存档】中所有课程的【章节】、【课程实操】、【作业—题库作业】、【考试】,这几个模块的任务数量 - data.put("exerciseNumber", teacherOpenCourseHandsOnSimulationTasks.size() + allQuestionSettingNumber + homeWorkNumber); + //学生做题 课程实操。学生做题:读取【文档存档】中所有课程的【章节】、【课程实操】、【作业—题库作业】、【考试】,这几个模块的任务数量 (题目配置数量,非题目数量) + data.put("exerciseNumber", teacherOpenCourseHandsOnSimulationTasks.size() + courseQuestionSettings.size() + homeWorkNumber); //学校动态码 data.put("universitiesCollegesAuthCode", universitiesColleges != null ? universitiesColleges.getUniversitiesCollegesAuthCode() : "暂无动态码"); //注册用户数