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

web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScheduleSessionOptions.java

@@ -8,6 +8,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
@@ -53,7 +54,7 @@ public class TeacherOpenCourseScheduleSessionOptions {
      *
      */
     @NotEmpty(message = "开课节次不能为空", groups =ValidateConfig.ADD.class)
-    private Map<Long, Set<Long>> sessionClassList;
+    private Map<Long, List<TeacherOpenCourseScheduleSessionTag>> sessionClassList;
     /**
      * 开课开始时间
      */

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

@@ -24,7 +24,10 @@ import com.ibeetl.jlw.dao.TeacherOpenCourseScheduleSessionClassDao;
 import com.ibeetl.jlw.dao.TeacherOpenCourseScheduleSessionDao;
 import com.ibeetl.jlw.dao.TeacherOpenCourseScheduleSessionSnapDao;
 import com.ibeetl.jlw.dao.TeacherOpenCourseScheduleSessionTagDao;
-import com.ibeetl.jlw.entity.*;
+import com.ibeetl.jlw.entity.TeacherOpenCourseScheduleSession;
+import com.ibeetl.jlw.entity.TeacherOpenCourseScheduleSessionClass;
+import com.ibeetl.jlw.entity.TeacherOpenCourseScheduleSessionOptions;
+import com.ibeetl.jlw.entity.TeacherOpenCourseScheduleSessionSnap;
 import com.ibeetl.jlw.web.query.TeacherOpenCourseScheduleSessionClassQuery;
 import com.ibeetl.jlw.web.query.TeacherOpenCourseScheduleSessionQuery;
 import lombok.Data;
@@ -356,11 +359,11 @@ public class TeacherOpenCourseScheduleSessionService extends CoreBaseService<Tea
                 // 断言，确保开课节次不为空
                 Assert.notEmpty(sessionTagIdsList, "开课节次列表不能为空！");
                 // 课次的标签ID
-                String sessionTagIds = join(sessionTagIdsList, ",");
-                List<TeacherOpenCourseScheduleSessionTag> sessionTagList = teacherOpenCourseScheduleSessionTagDao.getByIds(sessionTagIds);
+//                String sessionTagIds = join(sessionTagIdsList, ",");
+//                List<TeacherOpenCourseScheduleSessionTag> sessionTagList = teacherOpenCourseScheduleSessionTagDao.getByIds(sessionTagIds);
 
                 // 拷贝属性
-                List<TeacherOpenCourseScheduleSessionSnap> res = BeanUtil.copyToList(sessionTagList, TeacherOpenCourseScheduleSessionSnap.class);
+                List<TeacherOpenCourseScheduleSessionSnap> res = BeanUtil.copyToList(sessionTagIdsList, TeacherOpenCourseScheduleSessionSnap.class);
                 res.forEach(item -> {
                     String className = getSessionClassFullName(sessionClassId, classIdMap);
                     item.setTeacherOpenCourseScheduleSessionSnapAddTime(new Date());