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

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

@@ -356,12 +356,14 @@ public class StudentHandsOnTaskPptService extends CoreBaseService<StudentHandsOn
             for (TeacherOpenCourseHandsOnSimulationTasksFile file : videoFile) {
                 Map<String, Object> map = new HashMap<>();
                 map.put("fileName", file.getFileName());
+                map.put("taskFileId", file.getTaskFileId());
                 map.put("schedule", 0);
                 map.put("fileUrl", file.getFileUrl());
                 list.add(map);
             }
             studentHandsOnTaskPpt.setPptFile(JSONArray.toJSONString(list));
             studentHandsOnTaskPpt.setPptFiles(list);
+            this.insert(studentHandsOnTaskPpt);
         }else {
             String videoFile = studentHandsOnTaskPpt.getPptFile();
             if (StringUtils.isNotEmpty(videoFile)) {

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

@@ -338,6 +338,7 @@ public class StudentHandsOnTaskVideoService extends CoreBaseService<StudentHands
         StudentHandsOnTaskVideo studentHandsOnTaskVideo = this.sqlManager.lambdaQuery(StudentHandsOnTaskVideo.class).andEq(StudentHandsOnTaskVideo::getHandsOnTaskId, taskId)
                 .andEq(StudentHandsOnTaskVideo::getStudentId, student.getStudentId()).singleSimple();
         if (studentHandsOnTaskVideo == null) {
+            studentHandsOnTaskVideo = new StudentHandsOnTaskVideo();
             TeacherOpenCourseHandsOnSimulationTasksFileQuery fileQuery = new TeacherOpenCourseHandsOnSimulationTasksFileQuery();
             fileQuery.setTaskId(taskId);
             //查询视频
@@ -356,12 +357,14 @@ public class StudentHandsOnTaskVideoService extends CoreBaseService<StudentHands
             for (TeacherOpenCourseHandsOnSimulationTasksFile file : videoFile) {
                 Map<String, Object> map = new HashMap<>();
                 map.put("fileName", file.getFileName());
+                map.put("taskFileId", file.getTaskFileId());
                 map.put("schedule", 0);
                 map.put("fileUrl", file.getFileUrl());
                 list.add(map);
             }
             studentHandsOnTaskVideo.setVideoFile(JSONArray.toJSONString(list));
             studentHandsOnTaskVideo.setVideoFiles(list);
+            this.insert(studentHandsOnTaskVideo);
         }else {
             String videoFile = studentHandsOnTaskVideo.getVideoFile();
             if (StringUtils.isNotEmpty(videoFile)) {