新增课程中心预览时需要用到的接口

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

@@ -442,6 +442,32 @@ public class StudentHandsOnTaskTheoryService extends CoreBaseService<StudentHand
         return JsonResult.success(resourcesQuestions);
     }
 
+
+
+
+    public JsonResult<List<TeacherOpenCourseMergeResourcesQuestion>> getHandsOnTaskkTheoryCenterByTaskId(Long taskId, CoreUser coreUser) {
+        //查询登录用的学生id
+        if (!coreUser.isStudent()) {
+            return null;
+        }
+        TeacherOpenCourseHandsOnSimulationTasksQuery tasksQuery = new TeacherOpenCourseHandsOnSimulationTasksQuery();
+        tasksQuery.setTaskId(taskId);
+        List<TeacherOpenCourseHandsOnSimulationTasks> 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<TeacherOpenCourseMergeResourcesQuestion> resourcesQuestions = questionService.getValuesByQueryNotWithPermission(questionQuery);
+        if (CollectionUtils.isEmpty(resourcesQuestions)) {
+            return JsonResult.success(resourcesQuestions);
+        }
+        return JsonResult.success(resourcesQuestions);
+    }
+
     /**
      *
      * @param teacherOpenCourseMergeResourcesQuestionQueries

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

@@ -484,7 +484,7 @@ public class TeacherOpenCourseHandsOnService extends CoreBaseService<TeacherOpen
                         }
                     }
                 }
-                int schedule = NumberUtil.div(decimal, BigDecimal.valueOf(tasksList.size()), 2).multiply(BigDecimal.valueOf(100)).intValue();
+                int schedule = NumberUtil.div(decimal, BigDecimal.valueOf(tasks.size()), 2).multiply(BigDecimal.valueOf(100)).intValue();
                 studentHandsOnVO.setSchedule(schedule);
             } else {
                 studentHandsOnVO.setSchedule(0);
@@ -496,6 +496,46 @@ public class TeacherOpenCourseHandsOnService extends CoreBaseService<TeacherOpen
         return JsonResult.success(studentHandsOnVOS);
     }
 
+    /**
+     * 查询课程实操-课程中心-不查成绩
+     *
+     * @param teacherOpenCourseId
+     * @param coreUser
+     * @return
+     */
+    public JsonResult<List<StudentHandsOnVO>> getHandsListCenterByOpenCourseId(Long teacherOpenCourseId, CoreUser coreUser) {
+
+        //查询实操
+        TeacherOpenCourseHandsOnQuery handsOnQuery = new TeacherOpenCourseHandsOnQuery();
+        handsOnQuery.setTeacherOpenCourseId(teacherOpenCourseId);
+        List<TeacherOpenCourseHandsOn> handsOnList = this.getValuesByQueryNotWithPermission(handsOnQuery);
+
+        List<TeacherOpenCourseHandsOnSimulationTasks> tasksList = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(handsOnList)) {
+            //查询实操任务
+            List<Long> handIds = handsOnList.stream().map(TeacherOpenCourseHandsOn::getHandsOnId).collect(Collectors.toList());
+            TeacherOpenCourseHandsOnSimulationTasksQuery tasksQuery = new TeacherOpenCourseHandsOnSimulationTasksQuery();
+            tasksQuery.setHandsOnIdPlural(CollectionUtil.join(handIds, ","));
+            tasksList = teacherOpenCourseHandsOnSimulationTasksService.getValuesByQueryNotWithPermission(tasksQuery);
+
+        }
+        List<StudentHandsOnVO> studentHandsOnVOS = new ArrayList<>();
+        for (TeacherOpenCourseHandsOn handsOn : handsOnList) {
+            StudentHandsOnVO studentHandsOnVO = new StudentHandsOnVO();
+            Long handsOnId = handsOn.getHandsOnId();
+            studentHandsOnVO.setChapterId(handsOn.getCourseChildNode());
+            studentHandsOnVO.setTeacherOpenCourseId(handsOn.getTeacherOpenCourseId());
+            List<TeacherOpenCourseHandsOnSimulationTasks> 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);
+    }
+
+
+
     /**
      * 复制开课实训到开课
      *

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<List<TeacherOpenCourseMergeResourcesQuestion>> getHandsOnTaskkTheoryCenterByTaskId(Long taskId, @SCoreUser CoreUser coreUser) {
+        return studentHandsOnTaskTheoryService.getHandsOnTaskkTheoryCenterByTaskId(taskId, coreUser);
+    }
+
     /**
      * 提交
      *

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<List<StudentHandsOnVO>> getHandsListCenterByOpenCourseId(Long teacherOpenCourseId, @SCoreUser CoreUser coreUser) {
+        if (teacherOpenCourseId == null) {
+            return JsonResult.fail();
+        }
+        return teacherOpenCourseHandsOnService.getHandsListCenterByOpenCourseId(teacherOpenCourseId, coreUser);
+    }
+
 }