Merge remote-tracking branch 'origin/beetlsql3-dev' into beetlsql3-dev

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

@@ -357,7 +357,7 @@ public class StudentHandsOnTaskTheoryService extends CoreBaseService<StudentHand
     }
 
 
-    public JsonResult<List<TeacherOpenCourseMergeResourcesQuestion>> getHandsOnTaskkTheoryByTaskId(Long taskId, CoreUser coreUser) {
+    public JsonResult<List<TeacherOpenCourseMergeResourcesQuestion>> getHandsOnTaskkTheoryByTaskId(Long taskId, CoreUser coreUser, int i) {
         //查询登录用的学生id
         if (!coreUser.isStudent()) {
             return null;
@@ -389,6 +389,10 @@ public class StudentHandsOnTaskTheoryService extends CoreBaseService<StudentHand
                 resourcesQuestion.set("myOptions", taskTheory.getMyOptions());
                 resourcesQuestion.set("taskId", taskId);
             }
+            if (i == 1) {
+                resourcesQuestion.setQuestionAnswer("");
+                resourcesQuestion.setQuestionAnalysis("");
+            }
         }
 
         return JsonResult.success(resourcesQuestions);
@@ -417,6 +421,12 @@ public class StudentHandsOnTaskTheoryService extends CoreBaseService<StudentHand
             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);
+
         List<StudentHandsOnTaskTheory> taskTheoryList = new ArrayList<>();
         for (TeacherOpenCourseMergeResourcesQuestion resourcesQuestion : teacherOpenCourseMergeResourcesQuestionQueries) {
             StudentHandsOnTaskTheory taskTheory = new StudentHandsOnTaskTheory();
@@ -427,8 +437,9 @@ public class StudentHandsOnTaskTheoryService extends CoreBaseService<StudentHand
             Integer questionType = resourcesQuestion.getQuestionType();
             taskTheory.setQuestionType(questionType);
             taskTheory.setMyOptions(resourcesQuestion.get("myOptions")+"");
-            taskTheory.setRightKey(resourcesQuestion.getQuestionAnswer());
-            if (resourcesQuestion.getQuestionAnswer().equals(resourcesQuestion.get("myOptions")+"")) {
+            TeacherOpenCourseMergeResourcesQuestion teacherOpenCourseMergeResourcesQuestion = resourcesQuestions.stream().filter(v -> v.getTeacherOpenCourseMergeResourcesQuestionId().equals(resourcesQuestion.getTeacherOpenCourseMergeResourcesQuestionId())).findFirst().orElse(new TeacherOpenCourseMergeResourcesQuestion());
+            taskTheory.setRightKey(teacherOpenCourseMergeResourcesQuestion.getQuestionAnswer());
+            if (teacherOpenCourseMergeResourcesQuestion.getQuestionAnswer().equals(resourcesQuestion.get("myOptions")+"")) {
                 if (questionType.equals(1)) {
                     taskTheory.setTheoryScore(tasks.getSingleScore());
                 }else if (questionType.equals(2)){
@@ -452,4 +463,18 @@ public class StudentHandsOnTaskTheoryService extends CoreBaseService<StudentHand
         this.insertBatch(taskTheoryList);
         return JsonResult.success("提交成功");
     }
+
+    public JsonResult<Boolean> isOverByTaskId(Long taskId, CoreUser coreUser) {
+        //查询登录用的学生id
+        if (!coreUser.isStudent()) {
+            return JsonResult.fail();
+        }
+        Student student = studentService.getByUserId(coreUser.getId());
+        List<StudentHandsOnTaskTheory> theoryList = this.sqlManager.lambdaQuery(StudentHandsOnTaskTheory.class).andEq(StudentHandsOnTaskTheory::getHandsOnTaskId, taskId)
+                .andEq(StudentHandsOnTaskTheory::getStudentId, student.getStudentId()).select();
+        if (CollectionUtils.isNotEmpty(theoryList)) {
+            return JsonResult.success(true);
+        }
+        return JsonResult.success(false);
+    }
 }

web/src/main/java/com/ibeetl/jlw/web/StudentHandsOnTaskTheoryController.java

@@ -582,12 +582,42 @@ public class StudentHandsOnTaskTheoryController{
      */
     @GetMapping(API+"/getHandsOnTaskkTheoryByTaskId")
     public JsonResult<List<TeacherOpenCourseMergeResourcesQuestion>> getHandsOnTaskkTheoryByTaskId(Long taskId, @SCoreUser CoreUser coreUser) {
-        return studentHandsOnTaskTheoryService.getHandsOnTaskkTheoryByTaskId(taskId, coreUser);
+        return studentHandsOnTaskTheoryService.getHandsOnTaskkTheoryByTaskId(taskId, coreUser, 1);
     }
 
+    /**
+     * 提交
+     * @param teacherOpenCourseMergeResourcesQuestionQuery
+     * @param coreUser
+     * @return
+     */
     @PostMapping(API + "/edit.do")
     public JsonResult<String> editDo(@Validated(ValidateConfig.UPDATE.class) List<TeacherOpenCourseMergeResourcesQuestion> teacherOpenCourseMergeResourcesQuestionQuery, @SCoreUser CoreUser coreUser) {
         return studentHandsOnTaskTheoryService.editDo(teacherOpenCourseMergeResourcesQuestionQuery, coreUser);
     }
 
+    /**
+     * 判断是否已经提交
+     * @param taskId 实操任务id
+     * @param coreUser
+     * @return true 已提交 false 未提交
+     */
+    @GetMapping(API+"/isOverByTaskId")
+    public JsonResult<Boolean> isOverByTaskId(Long taskId, @SCoreUser CoreUser coreUser) {
+        return studentHandsOnTaskTheoryService.isOverByTaskId(taskId, coreUser);
+    }
+
+    /**
+     * 理论测评查询学生做题详情
+     * @param taskId 实操任务id
+     * @param coreUser
+     * @return 学生选项 myOptions
+     */
+    @GetMapping(API+"/getHandsOnTaskkTheoryDetailByTaskId")
+    public JsonResult<List<TeacherOpenCourseMergeResourcesQuestion>> getHandsOnTaskkTheoryDetailByTaskId(Long taskId, @SCoreUser CoreUser coreUser) {
+        return studentHandsOnTaskTheoryService.getHandsOnTaskkTheoryByTaskId(taskId, coreUser, 2);
+    }
+
+
+
 }