From da167b67f5b9c5fd452fe5fe4c3c5d0b69524f2f Mon Sep 17 00:00:00 2001
From: xuliangtong <1124839262@qq.com>
Date: Wed, 26 Oct 2022 20:34:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E8=AF=BE=E6=89=B9=E9=87=8F=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E7=8F=AD=E7=BA=A7,=E6=89=B9=E9=87=8F=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=AD=A6=E7=94=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TeacherOpenCourseMergeSchoolClassController.java | 10 +++++++---
 .../web/TeacherOpenCourseMergeStudentController.java | 12 +++++++++---
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeSchoolClassController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeSchoolClassController.java
index 30f15cf0..329a7f1c 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeSchoolClassController.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeSchoolClassController.java
@@ -1,5 +1,6 @@
 package com.ibeetl.jlw.web;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.jlw.Interceptor.SCoreUser;
 import cn.jlw.validate.ValidateConfig;
 import com.ibeetl.admin.core.annotation.Function;
@@ -135,14 +136,17 @@ public class TeacherOpenCourseMergeSchoolClassController{
 
     @PostMapping(MODEL + "/addAll.json")
     @Function("teacherOpenCourseMergeSchoolClass.add")
-    public JsonResult addAll(TeacherOpenCourseMergeSchoolClassQuery teacherOpenCourseMergeSchoolClassQuery,@SCoreUser CoreUser coreUser){
+    public JsonResult addAll(List<TeacherOpenCourseMergeSchoolClassQuery> teacherOpenCourseMergeSchoolClassQuerys,@SCoreUser CoreUser coreUser){
         if(null == coreUser){
             return JsonResult.failMessage("请登录后再操作");
         }else{
+            for (TeacherOpenCourseMergeSchoolClassQuery teacherOpenCourseMergeSchoolClassQuery : teacherOpenCourseMergeSchoolClassQuerys) {
                 teacherOpenCourseMergeSchoolClassQuery.setUserId(coreUser.getId());
                 teacherOpenCourseMergeSchoolClassQuery.setOrgId(coreUser.getOrgId());
-            String msg = teacherOpenCourseMergeSchoolClassService.addAll(teacherOpenCourseMergeSchoolClassQuery);
-            if (StringUtils.isBlank(msg)) {
+            }
+            List<TeacherOpenCourseMergeSchoolClass> teacherOpenCourseMergeSchoolClasses = BeanUtil.copyToList(teacherOpenCourseMergeSchoolClassQuerys, TeacherOpenCourseMergeSchoolClass.class);
+            Boolean msg = teacherOpenCourseMergeSchoolClassService.insertBatch(teacherOpenCourseMergeSchoolClasses);
+            if (msg) {
                 return JsonResult.success();
             } else {
                 return JsonResult.failMessage("新增失败,"+msg);
diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeStudentController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeStudentController.java
index 76b201a1..dd411d7e 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeStudentController.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeStudentController.java
@@ -1,5 +1,6 @@
 package com.ibeetl.jlw.web;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.jlw.Interceptor.SCoreUser;
 import cn.jlw.Interceptor.TStudent;
 import cn.jlw.validate.ValidateConfig;
@@ -9,6 +10,7 @@ import com.ibeetl.admin.core.entity.CoreUser;
 import com.ibeetl.admin.core.file.FileService;
 import com.ibeetl.admin.core.web.JsonResult;
 import com.ibeetl.jlw.entity.Student;
+import com.ibeetl.jlw.entity.TeacherOpenCourseMergeSchoolClass;
 import com.ibeetl.jlw.entity.TeacherOpenCourseMergeStudent;
 import com.ibeetl.jlw.entity.dto.RandomStudentListDTO;
 import com.ibeetl.jlw.service.TeacherOpenCourseMergeStudentService;
@@ -178,14 +180,18 @@ public class TeacherOpenCourseMergeStudentController{
 
     @PostMapping(MODEL + "/addAll.json")
     @Function("teacherOpenCourseMergeStudent.add")
-    public JsonResult addAll(TeacherOpenCourseMergeStudentQuery teacherOpenCourseMergeStudentQuery,@SCoreUser CoreUser coreUser){
+    public JsonResult addAll(List<TeacherOpenCourseMergeStudentQuery> teacherOpenCourseMergeStudentQuerys,@SCoreUser CoreUser coreUser){
         if(null == coreUser){
             return JsonResult.failMessage("请登录后再操作");
         }else{
+            for (TeacherOpenCourseMergeStudentQuery teacherOpenCourseMergeStudentQuery : teacherOpenCourseMergeStudentQuerys) {
                 teacherOpenCourseMergeStudentQuery.setUserId(coreUser.getId());
                 teacherOpenCourseMergeStudentQuery.setOrgId(coreUser.getOrgId());
-            String msg = teacherOpenCourseMergeStudentService.addAll(teacherOpenCourseMergeStudentQuery);
-            if (StringUtils.isBlank(msg)) {
+            }
+            List<TeacherOpenCourseMergeStudent> teacherOpenCourseMergeSchoolClasses = BeanUtil.copyToList(teacherOpenCourseMergeStudentQuerys, TeacherOpenCourseMergeStudent.class);
+
+            Boolean msg = teacherOpenCourseMergeStudentService.insertBatch(teacherOpenCourseMergeSchoolClasses);
+            if (msg) {
                 return JsonResult.success();
             } else {
                 return JsonResult.failMessage("新增失败,"+msg);