From 5b6d9a1acafa6eeb03ad68a511ec3ef99bd46d2f Mon Sep 17 00:00:00 2001
From: yaodan <1421553879@qq.com>
Date: Fri, 19 May 2023 02:38:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B9=8B=E5=89=8D=E7=9A=84?=
 =?UTF-8?q?=E6=9D=A5=E6=BA=90sql=E5=88=AB=E5=90=8D=E8=B7=9Ffrom=5Ftype?=
 =?UTF-8?q?=E5=90=8C=E5=90=8D=E5=AF=BC=E8=87=B4=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/TeacherOpenCourseMergeCourseInfoService.java  | 8 ++++++--
 .../TeacherOpenCourseMergeResourcesQuestionService.java   | 1 +
 .../com/ibeetl/jlw/service/TeacherOpenCourseService.java  | 7 ++++---
 .../sql/jlw/teacherOpenCourseMergeResourcesInfo.md        | 2 +-
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeCourseInfoService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeCourseInfoService.java
index 6ee8ed10..d2eb5b15 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeCourseInfoService.java
+++ b/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);
 
             }
-        });
+        }
     }
 
     /**
diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeResourcesQuestionService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeResourcesQuestionService.java
index fa39ae06..5cbcfcfa 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeResourcesQuestionService.java
+++ b/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();
diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseService.java
index ac21cce4..26855d7f 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseService.java
+++ b/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);
 
         // 开课和教师关联数据
diff --git a/web/src/main/resources/sql/jlw/teacherOpenCourseMergeResourcesInfo.md b/web/src/main/resources/sql/jlw/teacherOpenCourseMergeResourcesInfo.md
index 1f3a76dd..629fb595 100644
--- a/web/src/main/resources/sql/jlw/teacherOpenCourseMergeResourcesInfo.md
+++ b/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
 ===