From 3c9d472a8e82c25a49ffcbd02d6b188f03a01ff4 Mon Sep 17 00:00:00 2001 From: yaodan <1421553879@qq.com> Date: Tue, 23 May 2023 20:39:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=AF=BE=E7=A8=8B=E4=B8=AD?= =?UTF-8?q?=E5=BF=83=E9=A2=84=E8=A7=88=E6=97=B6=E9=9C=80=E8=A6=81=E7=94=A8?= =?UTF-8?q?=E5=88=B0=E7=9A=84=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StudentHandsOnTaskTheoryService.java | 26 ++++++++++++ .../TeacherOpenCourseHandsOnService.java | 42 ++++++++++++++++++- .../StudentHandsOnTaskTheoryController.java | 12 ++++++ .../TeacherOpenCourseHandsOnController.java | 13 ++++++ 4 files changed, 92 insertions(+), 1 deletion(-) diff --git a/web/src/main/java/com/ibeetl/jlw/service/StudentHandsOnTaskTheoryService.java b/web/src/main/java/com/ibeetl/jlw/service/StudentHandsOnTaskTheoryService.java index a066f7fc..3fd648d0 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/StudentHandsOnTaskTheoryService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/StudentHandsOnTaskTheoryService.java @@ -442,6 +442,32 @@ public class StudentHandsOnTaskTheoryService extends CoreBaseService> getHandsOnTaskkTheoryCenterByTaskId(Long taskId, CoreUser coreUser) { + //查询登录用的学生id + if (!coreUser.isStudent()) { + return null; + } + TeacherOpenCourseHandsOnSimulationTasksQuery tasksQuery = new TeacherOpenCourseHandsOnSimulationTasksQuery(); + tasksQuery.setTaskId(taskId); + List tasksList = tasksService.getValuesByQueryNotWithPermission(tasksQuery); + if (CollectionUtils.isEmpty(tasksList)) { + return JsonResult.fail(); + } + TeacherOpenCourseHandsOnSimulationTasks tasks = tasksList.get(0); + String taskList = tasks.getTaskList(); + + TeacherOpenCourseMergeResourcesQuestionQuery questionQuery = new TeacherOpenCourseMergeResourcesQuestionQuery(); + questionQuery.setTeacherOpenCourseMergeResourcesQuestionIdPlural(taskList); + List resourcesQuestions = questionService.getValuesByQueryNotWithPermission(questionQuery); + if (CollectionUtils.isEmpty(resourcesQuestions)) { + return JsonResult.success(resourcesQuestions); + } + return JsonResult.success(resourcesQuestions); + } + /** * * @param teacherOpenCourseMergeResourcesQuestionQueries diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnService.java index 0dfe3db7..758e04bc 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnService.java @@ -484,7 +484,7 @@ public class TeacherOpenCourseHandsOnService extends CoreBaseService> getHandsListCenterByOpenCourseId(Long teacherOpenCourseId, CoreUser coreUser) { + + //查询实操 + TeacherOpenCourseHandsOnQuery handsOnQuery = new TeacherOpenCourseHandsOnQuery(); + handsOnQuery.setTeacherOpenCourseId(teacherOpenCourseId); + List handsOnList = this.getValuesByQueryNotWithPermission(handsOnQuery); + + List tasksList = new ArrayList<>(); + if (CollectionUtils.isNotEmpty(handsOnList)) { + //查询实操任务 + List handIds = handsOnList.stream().map(TeacherOpenCourseHandsOn::getHandsOnId).collect(Collectors.toList()); + TeacherOpenCourseHandsOnSimulationTasksQuery tasksQuery = new TeacherOpenCourseHandsOnSimulationTasksQuery(); + tasksQuery.setHandsOnIdPlural(CollectionUtil.join(handIds, ",")); + tasksList = teacherOpenCourseHandsOnSimulationTasksService.getValuesByQueryNotWithPermission(tasksQuery); + + } + List studentHandsOnVOS = new ArrayList<>(); + for (TeacherOpenCourseHandsOn handsOn : handsOnList) { + StudentHandsOnVO studentHandsOnVO = new StudentHandsOnVO(); + Long handsOnId = handsOn.getHandsOnId(); + studentHandsOnVO.setChapterId(handsOn.getCourseChildNode()); + studentHandsOnVO.setTeacherOpenCourseId(handsOn.getTeacherOpenCourseId()); + List tasks = tasksList.stream().filter(v -> v.getHandsOnId().equals(handsOnId)).collect(Collectors.toList()); + studentHandsOnVO.setHandsOnId(handsOnId); + studentHandsOnVO.setHandsOnName(handsOn.getHandsOnName()); + studentHandsOnVO.setHandsOnTaskNum(tasks.size()); + studentHandsOnVOS.add(studentHandsOnVO); + } + return JsonResult.success(studentHandsOnVOS); + } + + + /** * 复制开课实训到开课 * diff --git a/web/src/main/java/com/ibeetl/jlw/web/StudentHandsOnTaskTheoryController.java b/web/src/main/java/com/ibeetl/jlw/web/StudentHandsOnTaskTheoryController.java index c9e4b62c..b5f56ab6 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/StudentHandsOnTaskTheoryController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/StudentHandsOnTaskTheoryController.java @@ -488,6 +488,18 @@ public class StudentHandsOnTaskTheoryController { return studentHandsOnTaskTheoryService.getHandsOnTaskkTheoryByTaskId(taskId, coreUser, 1); } + /** + * 理论测评题目列表-课程中心-预览 + * + * @param taskId 实操任务id + * @param coreUser + * @return 学生选项 myOptions + */ + @GetMapping(API + "/getHandsOnTaskkTheoryCenterByTaskId") + public JsonResult> getHandsOnTaskkTheoryCenterByTaskId(Long taskId, @SCoreUser CoreUser coreUser) { + return studentHandsOnTaskTheoryService.getHandsOnTaskkTheoryCenterByTaskId(taskId, coreUser); + } + /** * 提交 * 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 b5e10a8a..df5d5151 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseHandsOnController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseHandsOnController.java @@ -785,4 +785,17 @@ public class TeacherOpenCourseHandsOnController{ } + /** + * 学生查询课程实操-课程中心，不查成绩 + * @param teacherOpenCourseId 开课id + * @return 课程实操 + */ + @GetMapping(API + "/getHandsListCenterByOpenCourseId.do") + public JsonResult> getHandsListCenterByOpenCourseId(Long teacherOpenCourseId, @SCoreUser CoreUser coreUser) { + if (teacherOpenCourseId == null) { + return JsonResult.fail(); + } + return teacherOpenCourseHandsOnService.getHandsListCenterByOpenCourseId(teacherOpenCourseId, coreUser); + } + }