From 9656e69182b3300f3e62e1134b7ba68071df5369 Mon Sep 17 00:00:00 2001 From: Mlxa0324 Date: Thu, 3 Nov 2022 13:17:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=AF=BC=E5=85=A5=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E8=AF=BE=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...rOpenCourseMergeResourcesQuestionService.java | 16 +++++++++++----- ...enCourseMergeResourcesQuestionController.java | 6 +++--- 2 files changed, 14 insertions(+), 8 deletions(-) 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 91e81fc3..2f09d5b1 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeResourcesQuestionService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeResourcesQuestionService.java @@ -29,6 +29,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; import java.io.*; import java.math.BigDecimal; import java.util.*; @@ -364,18 +365,23 @@ public class TeacherOpenCourseMergeResourcesQuestionService extends CoreBaseServ /** * 从resources_question 表，拷贝数据。类似从模板中，拉取数据 + * * @param resourcesQuestionIds + * @param teacherOpenCourseId * @return */ - public void copyFromQuestion(@NotEmpty(message = "资源题目ID不能为空！") Set resourcesQuestionIds) { + public void copyFromQuestion(@NotEmpty(message = "资源题目ID不能为空！") Set resourcesQuestionIds, + @NotNull(message = "开课ID不能为空！") Long teacherOpenCourseId) { // 题目ID集合 String ids = join(resourcesQuestionIds, ","); List resourcesQuestions = resourcesQuestionDao.getByIds(ids); -// resourcesQuestions - // 默认有 - List copyToList = BeanUtil.copyToList(resourcesQuestions, TeacherOpenCourseMergeResourcesQuestion.class); - + List copyToList = + BeanUtil.copyToList(resourcesQuestions, TeacherOpenCourseMergeResourcesQuestion.class); + // 设置开课ID + copyToList.forEach(item -> item.setTeacherOpenCourseId(teacherOpenCourseId)); + // 批量插入 + teacherOpenCourseMergeResourcesQuestionDao.insertBatch(copyToList); } } diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeResourcesQuestionController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeResourcesQuestionController.java index c697e43f..e9056bb0 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeResourcesQuestionController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeResourcesQuestionController.java @@ -420,13 +420,13 @@ public class TeacherOpenCourseMergeResourcesQuestionController{ } /** - * 教师端-导入题目操作，拆分 + * 教师端-导入题目操作，逻辑拆分 * @param resourcesQuestionIds * @return */ @PostMapping(API + "/copyFromQuestion.do") - public JsonResult copyFromQuestion(Set resourcesQuestionIds) { - teacherOpenCourseMergeResourcesQuestionService.copyFromQuestion(resourcesQuestionIds); + public JsonResult copyFromQuestion(Set resourcesQuestionIds, Long teacherOpenCourseId) { + teacherOpenCourseMergeResourcesQuestionService.copyFromQuestion(resourcesQuestionIds, teacherOpenCourseId); return JsonResult.success(); }