diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeSchoolClassService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeSchoolClassService.java
index f029a756..dbb3658e 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeSchoolClassService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeSchoolClassService.java
@@ -79,6 +79,8 @@ public class TeacherOpenCourseMergeSchoolClassService extends CoreBaseService<Te
                 TeacherOpenCourseMergeSchoolClass teacherOpenCourseMergeSchoolClass = teacherOpenCourseMergeSchoolClassList.get(i);
                 teacherOpenCourseMergeSchoolClass.setUserId(teacherOpenCourseMergeSchoolClassQuery.getUserId());
                 teacherOpenCourseMergeSchoolClass.setOrgId(teacherOpenCourseMergeSchoolClassQuery.getOrgId());
+                teacherOpenCourseMergeSchoolClass.setTeacherOpenCourseMergeSchoolClassAddTime(new Date());
+                teacherOpenCourseMergeSchoolClass.setTeacherOpenCourseMergeSchoolClassStatus(1);
             }
             insertBatch(teacherOpenCourseMergeSchoolClassList);
         }
diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeStudentService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeStudentService.java
index eb26a0cb..6f3a5444 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeStudentService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeStudentService.java
@@ -1,6 +1,7 @@
 package com.ibeetl.jlw.service;
 
 import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
 import cn.jlw.util.ToolUtils;
 import cn.jlw.validate.ValidateConfig;
 import com.alibaba.fastjson.JSON;
@@ -14,6 +15,7 @@ import com.ibeetl.admin.core.web.JsonReturnCode;
 import com.ibeetl.jlw.dao.*;
 import com.ibeetl.jlw.entity.*;
 import com.ibeetl.jlw.entity.dto.RandomStudentListDTO;
+import com.ibeetl.jlw.enums.OpenCourseMergeJoinTypeEnum;
 import com.ibeetl.jlw.web.query.TeacherOpenCourseMergeStudentQuery;
 import org.apache.commons.lang3.StringUtils;
 import org.beetl.sql.core.SqlId;
@@ -30,6 +32,7 @@ import java.util.Date;
 import java.util.List;
 
 import static com.ibeetl.admin.core.util.user.CacheUserUtil.getUser;
+import static com.ibeetl.jlw.enums.OpenCourseMergeJoinTypeEnum.student_join;
 
 /**
  * 开课关联学生 Service
@@ -96,6 +99,10 @@ public class TeacherOpenCourseMergeStudentService extends CoreBaseService<Teache
                 TeacherOpenCourseMergeStudent teacherOpenCourseMergeStudent = teacherOpenCourseMergeStudentList.get(i);
                 teacherOpenCourseMergeStudent.setUserId(teacherOpenCourseMergeStudentQuery.getUserId());
                 teacherOpenCourseMergeStudent.setOrgId(teacherOpenCourseMergeStudentQuery.getOrgId());
+                teacherOpenCourseMergeStudent.setTeacherOpenCourseSchoolClassMergeStudentAddTime(new Date());
+                OpenCourseMergeJoinTypeEnum joinType = teacherOpenCourseMergeStudent.getTeacherOpenCourseSchoolClassMergeStudentJoinType();
+                teacherOpenCourseMergeStudent.setTeacherOpenCourseSchoolClassMergeStudentJoinType(ObjectUtil.defaultIfNull(joinType, student_join));
+                teacherOpenCourseMergeStudent.setTeacherOpenCourseSchoolClassMergeStudentStatus(1);
             }
             insertBatch(teacherOpenCourseMergeStudentList);
         }
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 454ff9ad..7ea8609c 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeSchoolClassController.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeSchoolClassController.java
@@ -1,6 +1,5 @@
 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;
@@ -136,17 +135,17 @@ public class TeacherOpenCourseMergeSchoolClassController{
 
     @PostMapping(MODEL + "/addAll.json")
     @Function("teacherOpenCourseMergeSchoolClass.add")
-    public JsonResult addAll(List<TeacherOpenCourseMergeSchoolClassQuery> teacherOpenCourseMergeSchoolClassQuerys,@SCoreUser CoreUser coreUser){
+    public JsonResult addAll(TeacherOpenCourseMergeSchoolClassQuery teacherOpenCourseMergeSchoolClassQuery, @SCoreUser CoreUser coreUser){
         if(null == coreUser){
             return JsonResult.failMessage("请登录后再操作");
         }else{
-            for (TeacherOpenCourseMergeSchoolClassQuery teacherOpenCourseMergeSchoolClassQuery : teacherOpenCourseMergeSchoolClassQuerys) {
-                teacherOpenCourseMergeSchoolClassQuery.setUserId(coreUser.getId());
-                teacherOpenCourseMergeSchoolClassQuery.setOrgId(coreUser.getOrgId());
+            teacherOpenCourseMergeSchoolClassQuery.setUserId(coreUser.getId());
+            teacherOpenCourseMergeSchoolClassQuery.setOrgId(coreUser.getOrgId());
+            if(null == teacherOpenCourseMergeSchoolClassQuery.getTeacherOpenCourseMergeSchoolClassStatus()){
+                teacherOpenCourseMergeSchoolClassQuery.setTeacherOpenCourseMergeSchoolClassStatus(1);
             }
-            List<TeacherOpenCourseMergeSchoolClass> teacherOpenCourseMergeSchoolClasses = BeanUtil.copyToList(teacherOpenCourseMergeSchoolClassQuerys, TeacherOpenCourseMergeSchoolClass.class);
-            Boolean msg = teacherOpenCourseMergeSchoolClassService.insertBatch(teacherOpenCourseMergeSchoolClasses);
-            if (msg) {
+            String msg = teacherOpenCourseMergeSchoolClassService.addAll(teacherOpenCourseMergeSchoolClassQuery);
+            if (StringUtils.isBlank(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 71c6333c..8a64b7d5 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeStudentController.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeStudentController.java
@@ -1,6 +1,5 @@
 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;
@@ -179,18 +178,17 @@ public class TeacherOpenCourseMergeStudentController{
 
     @PostMapping(MODEL + "/addAll.json")
     @Function("teacherOpenCourseMergeStudent.add")
-    public JsonResult addAll(List<TeacherOpenCourseMergeStudentQuery> teacherOpenCourseMergeStudentQuerys,@SCoreUser CoreUser coreUser){
+    public JsonResult addAll(TeacherOpenCourseMergeStudentQuery teacherOpenCourseMergeStudentQuery,@SCoreUser CoreUser coreUser){
         if(null == coreUser){
             return JsonResult.failMessage("请登录后再操作");
         }else{
-            for (TeacherOpenCourseMergeStudentQuery teacherOpenCourseMergeStudentQuery : teacherOpenCourseMergeStudentQuerys) {
-                teacherOpenCourseMergeStudentQuery.setUserId(coreUser.getId());
-                teacherOpenCourseMergeStudentQuery.setOrgId(coreUser.getOrgId());
+            teacherOpenCourseMergeStudentQuery.setUserId(coreUser.getId());
+            teacherOpenCourseMergeStudentQuery.setOrgId(coreUser.getOrgId());
+            if(null == teacherOpenCourseMergeStudentQuery.getTeacherOpenCourseSchoolClassMergeStudentStatus()){
+                teacherOpenCourseMergeStudentQuery.setTeacherOpenCourseSchoolClassMergeStudentStatus(1);
             }
-            List<TeacherOpenCourseMergeStudent> teacherOpenCourseMergeSchoolClasses = BeanUtil.copyToList(teacherOpenCourseMergeStudentQuerys, TeacherOpenCourseMergeStudent.class);
-
-            Boolean msg = teacherOpenCourseMergeStudentService.insertBatch(teacherOpenCourseMergeSchoolClasses);
-            if (msg) {
+            String msg = teacherOpenCourseMergeStudentService.addAll(teacherOpenCourseMergeStudentQuery);
+            if (StringUtils.isBlank(msg)) {
                 return JsonResult.success();
             } else {
                 return JsonResult.failMessage("新增失败,"+msg);
@@ -206,9 +204,9 @@ public class TeacherOpenCourseMergeStudentController{
         }else{
                 teacherOpenCourseMergeStudentQuery.setUserId(coreUser.getId());
                 teacherOpenCourseMergeStudentQuery.setOrgId(coreUser.getOrgId());
-                        if(null == teacherOpenCourseMergeStudentQuery.getTeacherOpenCourseSchoolClassMergeStudentStatus()){
-                            teacherOpenCourseMergeStudentQuery.setTeacherOpenCourseSchoolClassMergeStudentStatus(1);
-                        }
+                if(null == teacherOpenCourseMergeStudentQuery.getTeacherOpenCourseSchoolClassMergeStudentStatus()){
+                    teacherOpenCourseMergeStudentQuery.setTeacherOpenCourseSchoolClassMergeStudentStatus(1);
+                }
             return teacherOpenCourseMergeStudentService.add(teacherOpenCourseMergeStudentQuery);
         }
     }
diff --git a/web/src/test/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeSchoolClassControllerTest.java b/web/src/test/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeSchoolClassControllerTest.java
index 9389e26e..1e83bff4 100644
--- a/web/src/test/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeSchoolClassControllerTest.java
+++ b/web/src/test/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeSchoolClassControllerTest.java
@@ -83,7 +83,23 @@ public class TeacherOpenCourseMergeSchoolClassControllerTest extends BaseTest {
     }
 
     @Test
-    public void addAll() {
+    public void addAll() throws Exception {
+        // 自动填充属性
+        String param = "[{\"schoolClassId\":\"3\",\"teacherOpenCourseId\":\"1569\"},{\"schoolClassId\":\"4\",\"teacherOpenCourseId\":\"1569\"},{\"schoolClassId\":\"5\",\"teacherOpenCourseId\":\"1569\"},{\"schoolClassId\":\"8\",\"teacherOpenCourseId\":\"1569\"},{\"schoolClassId\":\"11\",\"teacherOpenCourseId\":\"1569\"}]";
+
+        // 测试账号，佟老师
+        putLoginInfoToEnv("102", "45");
+
+        //构造请求参数
+        RequestBuilder rb = MockMvcRequestBuilders.post(MODEL + "/addAll.json").contentType(MediaType.APPLICATION_FORM_URLENCODED_VALUE)
+                .param("teacherOpenCourseMergeSchoolClassJsonStr", param);
+        //发送请求，验证返回结果
+        String result = mvc.perform(rb)
+                .andExpect(status().isOk())
+                .andExpect(MockMvcResultMatchers.jsonPath("$.code").value("0"))
+                .andReturn().getResponse().getContentAsString(Charset.defaultCharset());
+
+        System.out.println(result);
     }
 
     @Test
@@ -109,4 +125,5 @@ public class TeacherOpenCourseMergeSchoolClassControllerTest extends BaseTest {
     @Test
     public void deleteByCondition() {
     }
+
 }
\ No newline at end of file
diff --git a/web/src/test/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeStudentControllerTest.java b/web/src/test/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeStudentControllerTest.java
index 25f1b871..992728db 100644
--- a/web/src/test/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeStudentControllerTest.java
+++ b/web/src/test/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeStudentControllerTest.java
@@ -171,4 +171,24 @@ class TeacherOpenCourseMergeStudentControllerTest extends BaseTest {
         System.out.println(result);
         clearEnvLoginInfo();
     }
+
+    @Test
+    void addAll() throws Exception {
+        // 自动填充属性
+        String param = "[{\"studentId\":\"3179\",\"teacherOpenCourseId\":\"1569\"},{\"studentId\":\"3180\",\"teacherOpenCourseId\":\"1569\"},{\"studentId\":\"3181\",\"teacherOpenCourseId\":\"1569\"},{\"studentId\":\"3182\",\"teacherOpenCourseId\":\"1569\"},{\"studentId\":\"3183\",\"teacherOpenCourseId\":\"1569\"},{\"studentId\":\"3184\",\"teacherOpenCourseId\":\"1569\"},{\"studentId\":\"3185\",\"teacherOpenCourseId\":\"1569\"},{\"studentId\":\"3186\",\"teacherOpenCourseId\":\"1569\"}]";
+
+        // 测试账号，佟老师
+        putLoginInfoToEnv("102", "45");
+
+        //构造请求参数
+        RequestBuilder rb = MockMvcRequestBuilders.post(MODEL + "/addAll.json").contentType(MediaType.APPLICATION_FORM_URLENCODED_VALUE)
+                .param("teacherOpenCourseMergeStudentJsonStr", param);
+        //发送请求，验证返回结果
+        String result = mvc.perform(rb)
+                .andExpect(status().isOk())
+                .andExpect(MockMvcResultMatchers.jsonPath("$.code").value("0"))
+                .andReturn().getResponse().getContentAsString(Charset.defaultCharset());
+
+        System.out.println(result);
+    }
 }
\ No newline at end of file