From d9e45016dfe6041a729794b6acbe57d859b38991 Mon Sep 17 00:00:00 2001
From: Mlxa0324 <mlx950324@163.com>
Date: Wed, 9 Nov 2022 17:44:41 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E6=AC=A1=E6=94=AF=E6=8C=81=E8=87=AA?=
=?UTF-8?q?=E5=AE=9A=E4=B9=89=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../TeacherOpenCourseHandsOnSimulationTasks.java | 1 -
.../TeacherOpenCourseScheduleSessionOptions.java | 3 ++-
.../TeacherOpenCourseScheduleSessionService.java | 11 +++++++----
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseHandsOnSimulationTasks.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseHandsOnSimulationTasks.java
index 6afb9a79..633636b5 100644
--- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseHandsOnSimulationTasks.java
+++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseHandsOnSimulationTasks.java
@@ -3,7 +3,6 @@ package com.ibeetl.jlw.entity;
import com.ibeetl.admin.core.entity.BaseEntity;
import com.ibeetl.admin.core.util.ValidateConfig;
import com.ibeetl.jlw.entity.vo.HandsOnTaskProblemVO;
-import com.ibeetl.jlw.web.query.TeacherOpenCourseHandsOnSimulationTasksFile;
import org.beetl.sql.annotation.entity.AssignID;
import javax.validation.constraints.NotNull;
diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScheduleSessionOptions.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScheduleSessionOptions.java
index fe2e782c..5de42394 100644
--- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScheduleSessionOptions.java
+++ b/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;
/**
* 开课开始时间
*/
diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseScheduleSessionService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseScheduleSessionService.java
index d65f24fe..75d2bb8b 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseScheduleSessionService.java
+++ b/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());