From 1e9421b36f8b8ddc28a8cb1d36842c821f985e90 Mon Sep 17 00:00:00 2001
From: yaodan <1421553879@qq.com>
Date: Sun, 23 Apr 2023 22:27:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8E=92=E8=AF=BE=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TeacherOpenCourseMergeScheduleSessionService.java     | 6 ++++--
 .../TeacherOpenCourseMergeScheduleSessionController.java  | 8 ++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeScheduleSessionService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeScheduleSessionService.java
index 8438e8a9..90e6a4a3 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeScheduleSessionService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeScheduleSessionService.java
@@ -309,16 +309,18 @@ public class TeacherOpenCourseMergeScheduleSessionService extends CoreBaseServic
      * 教师端-导入课程
      * @param teacherOpenCourseScheduleSessionIds   导入的排课IDs
      */
-    public void importScheduleSession(@NotEmpty(message = "排IDs不能为空！") String teacherOpenCourseScheduleSessionIds) {
+    public void importScheduleSession(@NotEmpty(message = "排IDs不能为空！") String teacherOpenCourseScheduleSessionIds,Long teacherOpenCourseId) {
 
         for (String id : teacherOpenCourseScheduleSessionIds.split(",")) {
             Long teacherOpenCourseScheduleSessionId = Long.valueOf(id);
+            //排课
             TeacherOpenCourseScheduleSession info = teacherOpenCourseScheduleSessionService.getInfo(teacherOpenCourseScheduleSessionId);
             // 先删除，再导入。支持导入重复数据，保证数据唯一
-            teacherOpenCourseMergeScheduleSessionDao.deleteByTeacherOpenCourseIdAndSessionId(info.getTeacherOpenCourseId(), teacherOpenCourseScheduleSessionId);
+            teacherOpenCourseMergeScheduleSessionDao.deleteByTeacherOpenCourseIdAndSessionId(teacherOpenCourseId, teacherOpenCourseScheduleSessionId);
 
             // 保存到关联表
             TeacherOpenCourseMergeScheduleSession scheduleSession = BeanUtil.copyProperties(info, TeacherOpenCourseMergeScheduleSession.class);
+            scheduleSession.setTeacherOpenCourseId(teacherOpenCourseId);
             scheduleSession.setTeacherOpenCourseMergeScheduleSessionStatus(1);
             scheduleSession.setTeacherOpenCourseMergeScheduleSessionAddTime(new Date());
             teacherOpenCourseMergeScheduleSessionDao.insert(scheduleSession);
diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeScheduleSessionController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeScheduleSessionController.java
index 0ba8edce..38a5d6da 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeScheduleSessionController.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeScheduleSessionController.java
@@ -122,8 +122,8 @@ public class TeacherOpenCourseMergeScheduleSessionController{
      * @return
      */
     @PostMapping(API + "/importScheduleSession.do")
-    public JsonResult importScheduleSessionDo(String teacherOpenCourseScheduleSessionIds){
-        teacherOpenCourseMergeScheduleSessionService.importScheduleSession(teacherOpenCourseScheduleSessionIds);
+    public JsonResult importScheduleSessionDo(String teacherOpenCourseScheduleSessionIds,Long teacherOpenCourseId){
+        teacherOpenCourseMergeScheduleSessionService.importScheduleSession(teacherOpenCourseScheduleSessionIds,teacherOpenCourseId);
         return JsonResult.success();
     }
 
@@ -449,8 +449,8 @@ public class TeacherOpenCourseMergeScheduleSessionController{
      */
     @PostMapping(MODEL + "/importScheduleSession.json")
     @Function("teacherOpenCourseMergeScheduleSession.edit")
-    public JsonResult importScheduleSession(String teacherOpenCourseScheduleSessionIds){
-        teacherOpenCourseMergeScheduleSessionService.importScheduleSession(teacherOpenCourseScheduleSessionIds);
+    public JsonResult importScheduleSession(String teacherOpenCourseScheduleSessionIds,Long teacherOpenCourseId){
+        teacherOpenCourseMergeScheduleSessionService.importScheduleSession(teacherOpenCourseScheduleSessionIds,teacherOpenCourseId);
         return JsonResult.success();
     }