课程管理添加班级ID

web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourse.java

@@ -62,6 +62,12 @@ public class TeacherOpenCourse extends BaseEntity{
     @InsertIgnore
     private MergeTeacherInfo teacherInfo;
 
+    @FetchSql("select GROUP_CONCAT(t.school_class_id) from teacher_open_course_merge_school_class t  " +
+            "where  t.teacher_open_course_merge_school_class_status = 1 and t.teacher_open_course_id = #teacherOpenCourseId# ")
+    @UpdateIgnore
+    @InsertIgnore
+    private String schoolClassIds;
+
     @FetchSql("select GROUP_CONCAT(ta.class_name) from teacher_open_course_merge_school_class t  " +
             "left join school_class ta on t.school_class_id = ta.class_id " +
             "where  t.teacher_open_course_merge_school_class_status = 1 and t.teacher_open_course_id = #teacherOpenCourseId# ")
@@ -292,6 +298,14 @@ public class TeacherOpenCourse extends BaseEntity{
         this.schoolClassInfo = schoolClassInfo;
     }
 
+    public String getSchoolClassIds() {
+        return schoolClassIds;
+    }
+
+    public void setSchoolClassIds(String schoolClassIds) {
+        this.schoolClassIds = schoolClassIds;
+    }
+
     public Integer getCourseInfoCount() {
         return courseInfoCount;
     }

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

@@ -14,6 +14,7 @@ import com.ibeetl.jlw.dao.TeacherOpenCourseDao;
 import com.ibeetl.jlw.dao.TeacherOpenCourseMergeCourseInfoDao;
 import com.ibeetl.jlw.entity.Student;
 import com.ibeetl.jlw.entity.TeacherOpenCourse;
+import com.ibeetl.jlw.entity.TeacherOpenCourseMergeSchoolClass;
 import com.ibeetl.jlw.web.query.TeacherOpenCourseQuery;
 import org.apache.commons.lang3.StringUtils;
 import org.beetl.sql.core.SqlId;
@@ -41,51 +42,54 @@ import static com.ibeetl.admin.core.util.user.CacheUserUtil.getUser;
 
 @Service
 @Transactional
-public class TeacherOpenCourseService extends CoreBaseService<TeacherOpenCourse>{
+public class TeacherOpenCourseService extends CoreBaseService<TeacherOpenCourse> {
 
-    @Autowired private TeacherOpenCourseDao teacherOpenCourseDao;
+    @Autowired
+    private TeacherOpenCourseDao teacherOpenCourseDao;
     @Autowired
     private TeacherOpenCourseMergeTeacherService teacherOpenCourseMergeTeacherService;
     @Autowired
     private TeacherOpenCourseMergeCourseInfoService teacherOpenCourseMergeCourseInfoService;
 
-    @Autowired private TeacherOpenCourseMergeCourseInfoDao teacherOpenCourseMergeCourseInfoDao;
+    @Autowired
+    private TeacherOpenCourseMergeCourseInfoDao teacherOpenCourseMergeCourseInfoDao;
     @Autowired
     private TeacherService teacherService;
 
-    public PageQuery<TeacherOpenCourse>queryByCondition(PageQuery query){
+    public PageQuery<TeacherOpenCourse> queryByCondition(PageQuery query) {
         CoreUser user = getUser();
-        if(user.isTeacher()) {
+        if (user.isTeacher()) {
-           Long teacherId = teacherService.getByUserId(user.getId()).getTeacherId();
+            Long teacherId = teacherService.getByUserId(user.getId()).getTeacherId();
-           query.setPara("teacherId", teacherId);
+            query.setPara("teacherId", teacherId);
         }
         PageQuery ret =  teacherOpenCourseDao.queryByCondition(query);
         queryListAfter(ret.getList());
         return ret;
     }
 
-    public PageQuery<TeacherOpenCourse>queryByConditionQuery(PageQuery query){
+    public PageQuery<TeacherOpenCourse> queryByConditionQuery(PageQuery query) {
-        PageQuery ret =  teacherOpenCourseDao.queryByConditionQuery(query);
+        PageQuery ret = teacherOpenCourseDao.queryByConditionQuery(query);
         queryListAfter(ret.getList());
         return ret;
     }
 
-    public void deleteByList(List list){
+    public void deleteByList(List list) {
         String ids = "";
         ToolUtils.deleteNullList(list);
-        for(int i=0;null != list && i<list.size();i++){
+        for (int i = 0; null != list && i < list.size(); i++) {
-            ids += list.get(i).toString()+(i==list.size()-1?"":",");
+            ids += list.get(i).toString() + (i == list.size() - 1 ? "" : ",");
         }
-        if(StringUtils.isNotBlank(ids)){
+        if (StringUtils.isNotBlank(ids)) {
             teacherOpenCourseDao.deleteTeacherOpenCourseByIds(ids);
         }
     }
 
     /**
      * 删除教师开课，附带删除所有有关开课相关联的东西
+     *
      * @param ids
      */
-    public void logicDeleteTeacherOpenCourse(String ids){
+    public void logicDeleteTeacherOpenCourse(String ids) {
         try {
             teacherOpenCourseDao.logicDeleteTeacherOpenCourseByIds(ids);
         } catch (Exception e) {
@@ -95,9 +99,10 @@ public class TeacherOpenCourseService extends CoreBaseService<TeacherOpenCourse>
 
     /**
      * 删除教师开课，附带删除所有有关开课相关联的东西
+     *
      * @param ids
      */
-    public void deleteTeacherOpenCourse(String ids){
+    public void deleteTeacherOpenCourse(String ids) {
         try {
             teacherOpenCourseDao.deleteTeacherOpenCourseByIds(ids);
 
@@ -117,7 +122,7 @@ public class TeacherOpenCourseService extends CoreBaseService<TeacherOpenCourse>
         }
     }
 
-    public String addAll(TeacherOpenCourseQuery teacherOpenCourseQuery){
+    public String addAll(TeacherOpenCourseQuery teacherOpenCourseQuery) {
         String msg = "";
         List<TeacherOpenCourse> teacherOpenCourseList = new ArrayList<>();
         try {
@@ -125,11 +130,12 @@ public class TeacherOpenCourseService extends CoreBaseService<TeacherOpenCourse>
         } catch (Exception e) {
             try {
                 teacherOpenCourseList.add(JSONObject.parseObject(teacherOpenCourseQuery.getTeacherOpenCourseJsonStr(), TeacherOpenCourse.class));
-            } catch (Exception e1) {}
+            } catch (Exception e1) {
+            }
         }
         ToolUtils.deleteNullList(teacherOpenCourseList);
-        if(null != teacherOpenCourseList && teacherOpenCourseList.size()>0){
+        if (null != teacherOpenCourseList && teacherOpenCourseList.size() > 0) {
-            for(int i=0;i<teacherOpenCourseList.size();i++){
+            for (int i = 0; i < teacherOpenCourseList.size(); i++) {
                 TeacherOpenCourse teacherOpenCourse = teacherOpenCourseList.get(i);
                 teacherOpenCourse.setUserId(teacherOpenCourseQuery.getUserId());
                 teacherOpenCourse.setOrgId(teacherOpenCourseQuery.getOrgId());
@@ -139,7 +145,7 @@ public class TeacherOpenCourseService extends CoreBaseService<TeacherOpenCourse>
         return msg;
     }
 
-    public JsonResult add(TeacherOpenCourseQuery teacherOpenCourseQuery){
+    public JsonResult add(TeacherOpenCourseQuery teacherOpenCourseQuery) {
         String msg = "";
         TeacherOpenCourse teacherOpenCourse = teacherOpenCourseQuery.pojo();
         teacherOpenCourse.setCreateTime(new Date());
@@ -164,8 +170,7 @@ public class TeacherOpenCourseService extends CoreBaseService<TeacherOpenCourse>
     }
 
 
-
+    public String edit(TeacherOpenCourseQuery teacherOpenCourseQuery) {
-    public String edit(TeacherOpenCourseQuery teacherOpenCourseQuery){
         String msg = "";
         TeacherOpenCourse teacherOpenCourse = teacherOpenCourseQuery.pojo();
         teacherOpenCourseDao.updateTemplateById(teacherOpenCourse);
@@ -181,7 +186,7 @@ public class TeacherOpenCourseService extends CoreBaseService<TeacherOpenCourse>
      * @Author: 87966
      * @Date: 2022/11/29 9:17
      */
-    public void batchEditStatus(@NotBlank String teacherOpenCourseIds, @NotNull Integer status){
+    public void batchEditStatus(@NotBlank String teacherOpenCourseIds, @NotNull Integer status) {
         for (String id : teacherOpenCourseIds.split(",")) {
             TeacherOpenCourse entity = new TeacherOpenCourse();
             entity.setTeacherOpenCourseId(Long.valueOf(id));
@@ -190,50 +195,51 @@ public class TeacherOpenCourseService extends CoreBaseService<TeacherOpenCourse>
         }
     }
 
-    public String updateGivenByIds(TeacherOpenCourseQuery teacherOpenCourseQuery){
+    public String updateGivenByIds(TeacherOpenCourseQuery teacherOpenCourseQuery) {
         String msg = "";
-        if(StringUtils.isNotBlank(teacherOpenCourseQuery.get_given())){
+        if (StringUtils.isNotBlank(teacherOpenCourseQuery.get_given())) {
             boolean flag = teacherOpenCourseDao.updateGivenByIds(teacherOpenCourseQuery) > 0;
-            if(!flag){
+            if (!flag) {
                 msg = "更新指定参数失败";
             }
-        }else{
+        } else {
             msg = "指定参数为空";
         }
         return msg;
     }
 
-    public List<TeacherOpenCourse> getValues (Object paras){
+    public List<TeacherOpenCourse> getValues(Object paras) {
-        return sqlManager.select(SqlId.of("jlw.teacherOpenCourse.getTeacherOpenCourseValues"),TeacherOpenCourse.class,paras);
+        return sqlManager.select(SqlId.of("jlw.teacherOpenCourse.getTeacherOpenCourseValues"), TeacherOpenCourse.class, paras);
     }
 
-    public List<TeacherOpenCourse> getValuesByQuery (TeacherOpenCourseQuery teacherOpenCourseQuery){
+    public List<TeacherOpenCourse> getValuesByQuery(TeacherOpenCourseQuery teacherOpenCourseQuery) {
         return teacherOpenCourseDao.getValuesByQuery(teacherOpenCourseQuery);
     }
 
-    @Cacheable(value="teacherOpenCourseService.getInfo", key="#teacherOpenCourseId")
+    @Cacheable(value = "teacherOpenCourseService.getInfo", key = "#teacherOpenCourseId")
-    public TeacherOpenCourse getInfo (Long teacherOpenCourseId){
+    public TeacherOpenCourse getInfo(Long teacherOpenCourseId) {
         TeacherOpenCourseQuery teacherOpenCourseQuery = new TeacherOpenCourseQuery();
         teacherOpenCourseQuery.setTeacherOpenCourseId(teacherOpenCourseId);
         List<TeacherOpenCourse> list = teacherOpenCourseDao.getValuesByQuery(teacherOpenCourseQuery);
-        if(null != list && list.size()>0){
+        if (null != list && list.size() > 0) {
             return list.get(0);
-        }else{
+        } else {
             return null;
         }
     }
 
-    public TeacherOpenCourse getInfo (TeacherOpenCourseQuery teacherOpenCourseQuery){
+    public TeacherOpenCourse getInfo(TeacherOpenCourseQuery teacherOpenCourseQuery) {
         List<TeacherOpenCourse> list = teacherOpenCourseDao.getValuesByQuery(teacherOpenCourseQuery);
-        if(null != list && list.size()>0){
+        if (null != list && list.size() > 0) {
             return list.get(0);
-        }else{
+        } else {
             return null;
         }
     }
 
     /**
      * 学生端-我的课程
+     *
      * @param student
      * @return
      */