diff --git a/web/src/main/java/com/ibeetl/jlw/service/CourseInfoService.java b/web/src/main/java/com/ibeetl/jlw/service/CourseInfoService.java index af38d814..675d03d4 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/CourseInfoService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/CourseInfoService.java @@ -424,6 +424,7 @@ public class CourseInfoService extends CoreBaseService { .lambdaQuery(CourseInfo.class) .andEq(CourseInfo::getCourseInfoParentId, courseInfoQuery.getCourseInfoParentId()) .andEq(CourseInfo::getCourseInfoType, courseInfoQuery.getCourseInfoType()) + .andEq(CourseInfo::getCourseInfoStatus,1) .select(); if (CollectionUtil.isEmpty(courseList)) { diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnSimulationTasksService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnSimulationTasksService.java index fe841fde..a744a685 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnSimulationTasksService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnSimulationTasksService.java @@ -675,7 +675,7 @@ public class TeacherOpenCourseHandsOnSimulationTasksService extends CoreBaseServ if (handsOnTaskLogs != null && handsOnTaskLogs.size() > 0) { long l = handsOnTaskLogs.get(0).getAllTime(); - BigDecimal divide = new BigDecimal(l).divide(new BigDecimal(60), 0, RoundingMode.HALF_UP); + BigDecimal divide = new BigDecimal(l).divide(new BigDecimal(60), 0, RoundingMode.HALF_DOWN); handsOnTaskScoreVO.setTime(divide.longValue()); } else { handsOnTaskScoreVO.setTime(0L); diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseHandsOnController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseHandsOnController.java index bd715bb4..4aa06525 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseHandsOnController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseHandsOnController.java @@ -231,6 +231,7 @@ public class TeacherOpenCourseHandsOnController{ TeacherOpenCourseHandsOnSimulationTasksQuery tasksQuery = new TeacherOpenCourseHandsOnSimulationTasksQuery(); tasksQuery.setTeacherOpenCourseId(teacherOpenCourseHandsOn.getTeacherOpenCourseId()); + tasksQuery.setHandsOnId(teacherOpenCourseHandsOn.getHandsOnId()); List tocTasks = teacherOpenCourseHandsOnSimulationTasksService.getValuesByQueryNotWithPermission(tasksQuery); view.addObject("teacherOpenCourseHandsOn", teacherOpenCourseHandsOn); view.addObject("handsOnSimulationTasks", tocTasks); diff --git a/web/src/main/resources/sql/jlw/resourcesInfo.md b/web/src/main/resources/sql/jlw/resourcesInfo.md index d56de595..d8cb8a15 100644 --- a/web/src/main/resources/sql/jlw/resourcesInfo.md +++ b/web/src/main/resources/sql/jlw/resourcesInfo.md @@ -407,9 +407,9 @@ getCurriculumResourceManagementList '2' AS source_type FROM resources_info ta - LEFT JOIN course_info la ON la.course_info_id = ta.course_info_id AND la.course_info_status = 1 - LEFT JOIN course_info lb ON lb.course_info_id = la.course_info_parent_id AND lb.course_info_status = 1 - LEFT JOIN course_info lc ON lc.course_info_id = lb.course_info_parent_id AND lc.course_info_status = 1 + JOIN course_info la ON la.course_info_id = ta.course_info_id AND la.course_info_status = 1 + JOIN course_info lb ON lb.course_info_id = la.course_info_parent_id AND lb.course_info_status = 1 + JOIN course_info lc ON lc.course_info_id = lb.course_info_parent_id AND lc.course_info_status = 1 LEFT JOIN core_org ld ON ld.`ID` = ta.org_id AND ld.DEL_FLAG = 0 WHERE ta.resources_info_status != 0 or ta.resources_info_status is null diff --git a/web/src/main/resources/sql/jlw/resourcesQuestion.md b/web/src/main/resources/sql/jlw/resourcesQuestion.md index c5ba3b8c..ddb4201e 100644 --- a/web/src/main/resources/sql/jlw/resourcesQuestion.md +++ b/web/src/main/resources/sql/jlw/resourcesQuestion.md @@ -579,8 +579,8 @@ getTestItemManageSystemOAndUniversities '2' AS source_type FROM resources_question a - LEFT JOIN course_info aa ON aa.course_info_id = a.course_info_id - LEFT JOIN course_info ab ON ab.course_info_id = aa.course_info_parent_id + JOIN course_info aa ON aa.course_info_id = a.course_info_id AND aa.course_info_status = 1 + JOIN course_info ab ON ab.course_info_id = aa.course_info_parent_id AND ab.course_info_status = 1 LEFT JOIN core_org ac ON ac.ID = a.org_id @if(!isEmpty(orgId)){ LEFT JOIN universities_colleges_jurisdiction_curriculum_resources lb ON lb.course_info_id = ab.course_info_id diff --git a/web/src/main/resources/sql/jlw/teacherOpenCourseMergeSchoolClass.md b/web/src/main/resources/sql/jlw/teacherOpenCourseMergeSchoolClass.md index c36ec6f1..89203064 100644 --- a/web/src/main/resources/sql/jlw/teacherOpenCourseMergeSchoolClass.md +++ b/web/src/main/resources/sql/jlw/teacherOpenCourseMergeSchoolClass.md @@ -218,6 +218,7 @@ getValuesByQuery select t.* from teacher_open_course_merge_school_class t + JOIN school_class a ON a.class_id = t.school_class_id AND a.class_status = 1 where 1=1 @if(!isEmpty(teacherOpenCourseMergeSchoolClassId)){ and t.teacher_open_course_merge_school_class_id =#teacherOpenCourseMergeSchoolClassId#