1

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

@@ -16,6 +16,7 @@ import com.ibeetl.admin.core.util.TimeTool;
 import com.ibeetl.admin.core.web.JsonResult;
 import com.ibeetl.admin.core.web.JsonReturnCode;
 import com.ibeetl.jlw.dao.StudentHandsOnTaskLogDao;
+import com.ibeetl.jlw.entity.Student;
 import com.ibeetl.jlw.entity.StudentHandsOnTaskLog;
 import com.ibeetl.jlw.web.query.StudentHandsOnTaskLogQuery;
 import com.ibeetl.jlw.entity.FileEntity;
@@ -52,6 +53,8 @@ public class StudentHandsOnTaskLogService extends CoreBaseService<StudentHandsOn
 
     @Autowired private StudentHandsOnTaskLogDao studentHandsOnTaskLogDao;
 
+    @Autowired private StudentService studentService;
+
     public PageQuery<StudentHandsOnTaskLog>queryByCondition(PageQuery query){
         PageQuery ret =  studentHandsOnTaskLogDao.queryByCondition(query);
         queryListAfter(ret.getList());
@@ -169,7 +172,12 @@ public class StudentHandsOnTaskLogService extends CoreBaseService<StudentHandsOn
         }
     }
 
-    public JsonResult addDo(StudentHandsOnTaskLogQuery studentHandsOnTaskLogQuery) {
+    public JsonResult addDo(StudentHandsOnTaskLogQuery studentHandsOnTaskLogQuery, CoreUser coreUser) {
+        if (!coreUser.isStudent()) {
+            return JsonResult.success();
+        }
+        Student student = studentService.getByUserId(coreUser.getId());
+        studentHandsOnTaskLogQuery.setStudentId(student.getStudentId());
         String msg = "";
         StudentHandsOnTaskLog studentHandsOnTaskLog = studentHandsOnTaskLogQuery.pojo();
         Long studentId = studentHandsOnTaskLog.getStudentId();

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

@@ -396,16 +396,19 @@ public class StudentHandsOnTaskTheoryService extends CoreBaseService<StudentHand
         if (CollectionUtils.isEmpty(resourcesQuestions)) {
             return JsonResult.success(resourcesQuestions);
         }
-        Collections.shuffle(resourcesQuestions);
-
+        if(i == 1) {
+            Collections.shuffle(resourcesQuestions);
+        }
         for (TeacherOpenCourseMergeResourcesQuestion resourcesQuestion : resourcesQuestions) {
             if(CollectionUtils.isNotEmpty(theoryList)) {
                 StudentHandsOnTaskTheory taskTheory = theoryList.stream().filter(v -> v.getOrgId().equals(resourcesQuestion.getTeacherOpenCourseMergeResourcesQuestionId()))
                         .filter(v -> v.getStudentId().equals(student.getStudentId())).filter(v -> v.getHandsOnTaskId().equals(taskId)).findFirst().orElse(null);
                 if (taskTheory == null) {
                     resourcesQuestion.set("myOptions", "");
+                    resourcesQuestion.set("studentScore", 0D);
                 }else {
                     resourcesQuestion.set("myOptions", taskTheory.getMyOptions());
+                    resourcesQuestion.set("studentScore", taskTheory.getTheoryScore());
                 }
 
             }

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

@@ -235,7 +235,7 @@ public class StudentHandsOnTaskLogController{
 
             studentHandsOnTaskLogQuery.setUserId(coreUser.getId());
             studentHandsOnTaskLogQuery.setOrgId(coreUser.getOrgId());
-            return studentHandsOnTaskLogService.addDo(studentHandsOnTaskLogQuery);
+            return studentHandsOnTaskLogService.addDo(studentHandsOnTaskLogQuery, coreUser);
         }
     }