1

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

@@ -1,7 +1,6 @@
 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;
@@ -32,6 +31,7 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
+import static cn.hutool.core.util.ObjectUtil.defaultIfNull;
 import static com.ibeetl.admin.core.util.StreamUtils.listJoin;
 import static com.ibeetl.admin.core.util.user.CacheUserUtil.getUser;
 import static com.ibeetl.jlw.enums.OpenCourseMergeJoinTypeEnum.student_join;
@@ -115,7 +115,7 @@ public class TeacherOpenCourseMergeStudentService extends CoreBaseService<Teache
                 teacherOpenCourseMergeStudent.setOrgId(teacherOpenCourseMergeStudentQuery.getOrgId());
                 teacherOpenCourseMergeStudent.setTeacherOpenCourseSchoolClassMergeStudentAddTime(new Date());
                 OpenCourseMergeJoinTypeEnum joinType = teacherOpenCourseMergeStudent.getTeacherOpenCourseSchoolClassMergeStudentJoinType();
-                teacherOpenCourseMergeStudent.setTeacherOpenCourseSchoolClassMergeStudentJoinType(ObjectUtil.defaultIfNull(joinType, student_join));
+                teacherOpenCourseMergeStudent.setTeacherOpenCourseSchoolClassMergeStudentJoinType(defaultIfNull(joinType, student_join));
                 teacherOpenCourseMergeStudent.setTeacherOpenCourseSchoolClassMergeStudentStatus(1);
             }
             insertBatch(teacherOpenCourseMergeStudentList);
@@ -123,13 +123,20 @@ public class TeacherOpenCourseMergeStudentService extends CoreBaseService<Teache
         return msg;
     }
 
+    /**
+     * 如果存在则不添加，提示给用户已存在
+     *
+     * @param teacherOpenCourseMergeStudentQuery
+     * @return
+     */
     public JsonResult add(TeacherOpenCourseMergeStudentQuery teacherOpenCourseMergeStudentQuery){
         String msg = "";
         TeacherOpenCourseMergeStudent teacherOpenCourseMergeStudent = teacherOpenCourseMergeStudentQuery.pojo();
 
         Long studentId = teacherOpenCourseMergeStudent.getStudentId();
         Long teacherOpenCourseId = teacherOpenCourseMergeStudent.getTeacherOpenCourseId();
-        boolean isNotExists = teacherOpenCourseMergeStudentDao.createLambdaQuery().andEq(TeacherOpenCourseMergeStudent::getStudentId, studentId)
+        boolean isNotExists = teacherOpenCourseMergeStudentDao.createLambdaQuery()
+                .andEq(TeacherOpenCourseMergeStudent::getStudentId, studentId)
                 .andEq(TeacherOpenCourseMergeStudent::getTeacherOpenCourseId, teacherOpenCourseId)
                 .andEq(TeacherOpenCourseMergeStudent::getTeacherOpenCourseSchoolClassMergeStudentStatus, 1)
                 .count() == 0;
@@ -223,29 +230,26 @@ public class TeacherOpenCourseMergeStudentService extends CoreBaseService<Teache
         Assert.notNull(teacherOpenCourseMergeTeacher, "该授权码未查询到开课信息！");
 
         // 条件：开课和当前学生所在班级，验证是否被分课
+        final Long teacherOpenCourseId = teacherOpenCourseMergeTeacher.getTeacherOpenCourseId();
+
         List<TeacherOpenCourseMergeSchoolClass> mergeSchoolClassList = teacherOpenCourseMergeSchoolClassDao.createLambdaQuery()
-                .andEq(TeacherOpenCourseMergeSchoolClass::getTeacherOpenCourseId, teacherOpenCourseMergeTeacher.getTeacherOpenCourseId())
+                .andEq(TeacherOpenCourseMergeSchoolClass::getTeacherOpenCourseId, teacherOpenCourseId)
                 .andEq(TeacherOpenCourseMergeSchoolClass::getSchoolClassId, student.getClassId())
                 .andEq(TeacherOpenCourseMergeSchoolClass::getTeacherOpenCourseMergeSchoolClassStatus, 1)
                 .select();
 
-        Assert.notEmpty(mergeSchoolClassList, "未分配课程！");
+        Assert.notEmpty(mergeSchoolClassList, "您所在的班级未分配课程！");
 
         teacherOpenCourseMergeStudentQuery.setUserId(student.getUserId());
         teacherOpenCourseMergeStudentQuery.setOrgId(student.getOrgId());
         teacherOpenCourseMergeStudentQuery.setStudentId(student.getStudentId());
+        teacherOpenCourseMergeStudentQuery.setTeacherOpenCourseId(teacherOpenCourseId);
+        // 为空则给默认值
+        teacherOpenCourseMergeStudentQuery.setTeacherOpenCourseSchoolClassMergeStudentStatus(
+                defaultIfNull(teacherOpenCourseMergeStudentQuery.getTeacherOpenCourseSchoolClassMergeStudentStatus(), 1));
 
-        if(null == teacherOpenCourseMergeStudentQuery.getTeacherOpenCourseSchoolClassMergeStudentStatus()){
-            teacherOpenCourseMergeStudentQuery.setTeacherOpenCourseSchoolClassMergeStudentStatus(1);
-        }
-
-        // 给这个班级分配了多少个课程，都加入到关系表中
-        for (TeacherOpenCourseMergeSchoolClass mergeSchoolClass : mergeSchoolClassList) {
-            teacherOpenCourseMergeStudentQuery.setTeacherOpenCourseId(mergeSchoolClass.getTeacherOpenCourseId());
-            // 插入数据
-            add(teacherOpenCourseMergeStudentQuery);
-        }
-
+        // 插入数据，内部判断是否重复，保证数据唯一
+        add(teacherOpenCourseMergeStudentQuery);
         return JsonResult.success();
     }