修复之前的来源sql别名跟from_type同名导致的bug

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

@@ -678,6 +678,8 @@ public class TeacherOpenCourseMergeCourseInfoService extends CoreBaseService<Tea
         model.setCourseInfoName(teacherOpenCourse.getTeacherOpenCourseTitle());
         model.setOrgId(teacherOpenCourse.getOrgId());
         model.setUserId(teacherOpenCourse.getUserId());
+        model.setFromType(FROM_OPEN_COURSE);
+        model.setSourceFromId(-1L);
         teacherOpenCourseMergeCourseInfoService.insert(model);
     }
 
@@ -809,7 +811,9 @@ public class TeacherOpenCourseMergeCourseInfoService extends CoreBaseService<Tea
         // 拷贝课程章节。返回的Map是不可修改的。
         Map<Long, Long> courseInfoIdPair = copyFromCourseInfo(courseInfoIds, teacherOpenCourseId);
 
-        courseInfoIds.stream().parallel().forEach(courseInfoId -> {
+        for (Long courseInfoId : courseInfoIds) {
+
+
             // 当前的课程节点信息
 //            CourseInfo currentCourseInfo = courseInfoService.getById(courseInfoId);
             // 获取这个课程章节下的所有的子章节信息
@@ -832,7 +836,7 @@ public class TeacherOpenCourseMergeCourseInfoService extends CoreBaseService<Tea
                 teacherOpenCourseHandsOnService.copySystemHandsToOpenCourse(teacherOpenCourseId, courseInfoId, courseInfoIdPair, resourcesQuestionIdPair);
 
             }
-        });
+        }
     }
 
     /**

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

@@ -166,6 +166,7 @@ public class TeacherOpenCourseMergeResourcesQuestionService extends CoreBaseServ
 
         String msg = "";
         TeacherOpenCourseMergeResourcesQuestion teacherOpenCourseMergeResourcesQuestion = teacherOpenCourseMergeResourcesQuestionQuery.pojo();
+        teacherOpenCourseMergeResourcesQuestion.setFromType(CopyFromEnum.FROM_OPEN_COURSE);
         teacherOpenCourseMergeResourcesQuestionDao.insert(teacherOpenCourseMergeResourcesQuestion);
         teacherOpenCourseMergeResourcesQuestionQuery.setTeacherOpenCourseMergeResourcesQuestionId(teacherOpenCourseMergeResourcesQuestion.getTeacherOpenCourseMergeResourcesQuestionId());
         JsonResult jsonResult = new JsonResult();

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

@@ -2,7 +2,6 @@ package com.ibeetl.jlw.service;
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.extra.spring.SpringUtil;
-import cn.jlw.Interceptor.SCoreUser;
 import cn.jlw.util.ToolUtils;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
@@ -11,11 +10,12 @@ import com.ibeetl.admin.core.service.CoreBaseService;
 import com.ibeetl.admin.core.util.PlatformException;
 import com.ibeetl.admin.core.web.JsonResult;
 import com.ibeetl.admin.core.web.JsonReturnCode;
-import com.ibeetl.jlw.dao.CourseInfoDao;
 import com.ibeetl.jlw.dao.TeacherOpenCourseDao;
 import com.ibeetl.jlw.dao.TeacherOpenCourseMergeCourseInfoDao;
 import com.ibeetl.jlw.dao.UniversitiesCollegesJurisdictionCurriculumResourcesDao;
-import com.ibeetl.jlw.entity.*;
+import com.ibeetl.jlw.entity.Student;
+import com.ibeetl.jlw.entity.TeacherOpenCourse;
+import com.ibeetl.jlw.entity.UniversitiesCollegesJurisdictionCurriculumResources;
 import com.ibeetl.jlw.web.query.TeacherOpenCourseQuery;
 import org.apache.commons.lang3.StringUtils;
 import org.beetl.sql.core.SqlId;
@@ -176,6 +176,7 @@ public class TeacherOpenCourseService extends CoreBaseService<TeacherOpenCourse>
         TeacherOpenCourse teacherOpenCourse = teacherOpenCourseQuery.pojo();
         teacherOpenCourse.setCreateTime(new Date());
         teacherOpenCourse.setTeacherOpenCourseStatus(1);
+
         teacherOpenCourseDao.insert(teacherOpenCourse);
 
         // 开课和教师关联数据

web/src/main/resources/sql/jlw/teacherOpenCourseMergeResourcesInfo.md

@@ -8,7 +8,7 @@ fromTypeFragment
   OR t.user_id IS NULL,
   '系统超管',
   '院校上传'
-  ) AS from_type
+  ) AS from_type_text
 
 queryByCondition
 ===