From 15162d80e5d2cd3096c64ed05886ab5a9f53c4bf Mon Sep 17 00:00:00 2001
From: yangdj <18302547071@163>
Date: Fri, 11 Aug 2023 23:36:04 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E4=B8=AD=E5=BF=83=20?=
 =?UTF-8?q?=E5=AE=9E=E6=93=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jlw/service/StudentHandsOnTaskTheoryService.java      | 2 +-
 .../jlw/web/StudentHandsOnTaskTheoryController.java       | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

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 6bdb0169..474ad8ec 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/StudentHandsOnTaskTheoryService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/StudentHandsOnTaskTheoryService.java
@@ -961,7 +961,7 @@ public class StudentHandsOnTaskTheoryService extends CoreBaseService<StudentHand
                 return JsonResult.fail();
             }
             TeacherOpenCourseHandsOnSimulationTasks tasks = tasksList.get(0);
-
+            handsOnId = tasks.getHandsOnId();
             String taskList = tasks.getTaskList();
             TeacherOpenCourseMergeResourcesQuestionQuery questionQuery = new TeacherOpenCourseMergeResourcesQuestionQuery();
             questionQuery.setTeacherOpenCourseMergeResourcesQuestionIdPlural(taskList);
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 81da1e40..fc0d7db1 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/StudentHandsOnTaskTheoryController.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/StudentHandsOnTaskTheoryController.java
@@ -3,10 +3,12 @@ package com.ibeetl.jlw.web;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.jlw.Interceptor.GetFile;
+
 import cn.jlw.Interceptor.RFile;
 import cn.jlw.Interceptor.SCoreUser;
 import cn.jlw.util.ToolUtils;
 import cn.jlw.validate.ValidateConfig;
+import com.alibaba.fastjson.JSONObject;
 import com.ibeetl.admin.core.annotation.Function;
 import com.ibeetl.admin.core.entity.CoreUser;
 import com.ibeetl.admin.core.file.FileService;
@@ -706,14 +708,16 @@ public class StudentHandsOnTaskTheoryController {
      * @return
      */
     @PostMapping(API + "/addCourseCentreTheoreticalEvaluationTask.do")
-    public JsonResult<String> addTheoreticalEvaluation(@Validated(ValidateConfig.UPDATE.class) @RequestBody List<TeacherOpenCourseMergeResourcesQuestionVO> teacherOpenCourseMergeResourcesQuestionQuery,
+    public JsonResult<String> addTheoreticalEvaluation(String teacherOpenCourseMergeResourcesQuestionQuery,
                                                        @SCoreUser CoreUser coreUser,
                                                        Integer temporarily,
                                                        Integer courseType) {
         if (ObjectUtil.isEmpty(courseType)){
             return JsonResult.failMessage("缺少课程类型" );
         }
-        return studentHandsOnTaskTheoryService.addTheoreticalEvaluation(teacherOpenCourseMergeResourcesQuestionQuery, coreUser, temporarily,courseType);
+        List<TeacherOpenCourseMergeResourcesQuestionVO> teacherOpenCourseMergeResourcesQuestionVOS = JSONObject.parseArray(teacherOpenCourseMergeResourcesQuestionQuery,TeacherOpenCourseMergeResourcesQuestionVO.class);
+
+        return studentHandsOnTaskTheoryService.addTheoreticalEvaluation(teacherOpenCourseMergeResourcesQuestionVOS, coreUser, temporarily,courseType);
     }
 
 }