导入课程实训案例

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

@@ -509,13 +509,11 @@ public class TeacherOpenCourseHandsOnService extends CoreBaseService<TeacherOpen
      * 复制开课实训到开课
      *
      * @param teacherOpenCourseId 老师公开课id
-     * @param courseInfoId        课程信息id，传最顶级即可
      * @param courseInfoIdPair    课程信息id对
      * @author zhouzhao
      * @date 2023/04/28 03:59:44
      */
     public void copyOpenCourseHandsToOpenCourse(@NotNull(message = "开课ID不能为空！") Long teacherOpenCourseId,
-                                            @NotNull(message = "课程ID不能为空！") Long courseInfoId,
                                             @Nullable Map<Long, Long> courseInfoIdPair,
                                             @Nullable Map<Long, Long> resourcesQuestionIdPair
                                             ) {
@@ -532,8 +530,8 @@ public class TeacherOpenCourseHandsOnService extends CoreBaseService<TeacherOpen
             throw new PlatformException("请先登录");
         }
         TeacherOpenCourseHandsOnQuery handsOnQuery = new TeacherOpenCourseHandsOnQuery();
-        //归属课程
-        handsOnQuery.setCourseInfoId(courseInfoId);
+        //归属开课
+        handsOnQuery.setTeacherOpenCourseId(teacherOpenCourseId);
         // 已上架的
         List<TeacherOpenCourseHandsOn> handsOnList = getValuesByQuery(handsOnQuery);
 
@@ -547,14 +545,14 @@ public class TeacherOpenCourseHandsOnService extends CoreBaseService<TeacherOpen
         for (TeacherOpenCourseHandsOn teacherOpenCourseHandsOn : handsOnList) {
             Long handsOnIdTemp = teacherOpenCourseHandsOn.getHandsOnId();
             String courseChildNodeTemp = teacherOpenCourseHandsOn.getCourseChildNode();
+            Long courseInfoId = teacherOpenCourseHandsOn.getCourseInfoId();
 
             Long newHandsOnId = snowflake.nextId();
             handsOnIdOldToNewMap.put(handsOnIdTemp, newHandsOnId);
             teacherOpenCourseHandsOn.setCourseChildNode(courseInfoIdPair.get(Long.parseLong(courseChildNodeTemp)).toString());
             teacherOpenCourseHandsOn.setHandsOnId(newHandsOnId);
             teacherOpenCourseHandsOn.setTeacherOpenCourseId(teacherOpenCourseId);
-            //别问我这里为什么放这个，他们自己的代码就是这样的
-            teacherOpenCourseHandsOn.setCourseInfoId(teacherOpenCourseId);
+            teacherOpenCourseHandsOn.setCourseInfoId(courseInfoId);
             teacherOpenCourseHandsOn.setOrgId(currentUser.getOrgId());
             teacherOpenCourseHandsOn.setUserId(currentUser.getId());
             teacherOpenCourseHandsOn.setAddTime(now);
@@ -693,8 +691,7 @@ public class TeacherOpenCourseHandsOnService extends CoreBaseService<TeacherOpen
             teacherOpenCourseHandsOn.setCourseChildNode(courseInfoIdPair.get(Long.parseLong(courseChildNodeTemp)).toString());
             teacherOpenCourseHandsOn.setHandsOnId(newHandsOnId);
             teacherOpenCourseHandsOn.setTeacherOpenCourseId(teacherOpenCourseId);
-            //别问我这里为什么放这个，他们自己的代码就是这样的
-            teacherOpenCourseHandsOn.setCourseInfoId(teacherOpenCourseId);
+            teacherOpenCourseHandsOn.setCourseInfoId(courseInfoId);
             teacherOpenCourseHandsOn.setOrgId(currentUser.getOrgId());
             teacherOpenCourseHandsOn.setUserId(currentUser.getId());
             teacherOpenCourseHandsOn.setAddTime(now);

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

@@ -822,7 +822,7 @@ public class TeacherOpenCourseMergeCourseInfoService extends CoreBaseService<Tea
                 teacherOpenCourseQuestionSettingService.copyOpenQuestionChapterTestQuestionToOpenCourse(teacherOpenCourseId, courseInfoIdPair);
                 // 拷贝系统资源库到教师开课
                 teacherOpenCourseMergeResourcesInfoService.copySystemResourcesInfoToOpenCourse(teacherOpenCourseId, courseInfos, courseInfoIdPair);
-
+                // 导入课程实训案例
                 teacherOpenCourseHandsOnService.copySystemHandsToOpenCourse(teacherOpenCourseId, courseInfoId, courseInfoIdPair,resourcesQuestionIdPair);
 
             }
@@ -1400,8 +1400,8 @@ public class TeacherOpenCourseMergeCourseInfoService extends CoreBaseService<Tea
                 teacherOpenCourseQuestionSettingService.copyOpenQuestionChapterTestQuestionToOpenCourse(teacherOpenCourseId, courseInfoIdPair);
                 // 拷贝开课资源库到教师开课
                 teacherOpenCourseMergeResourcesInfoService.copyOpenCourseResourcesInfoToOpenCourse(teacherOpenCourseId, courseInfos, courseInfoIdPair);
-
-                teacherOpenCourseHandsOnService.copyOpenCourseHandsToOpenCourse(teacherOpenCourseId, oldTeacherOpenCourseId, courseInfoIdPair,resourcesQuestionIdPair);
+                // 导入课程实训案例
+                teacherOpenCourseHandsOnService.copyOpenCourseHandsToOpenCourse(teacherOpenCourseId, courseInfoIdPair,resourcesQuestionIdPair);
 
 
             }