From ae50934c3d5a86bb5bccb57f74f8b43a3ec0752c Mon Sep 17 00:00:00 2001
From: Mlxa0324 <mlx950324@163.com>
Date: Thu, 20 Oct 2022 00:18:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E5=8A=A0=E5=85=A5=E5=BC=80?=
 =?UTF-8?q?=E8=AF=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TeacherOpenCourseMergeSchoolClassDao.java |  2 -
 ...cherOpenCourseMergeSchoolClassService.java |  9 ----
 ...rOpenCourseMergeSchoolClassController.java | 21 ++++------
 .../jlw/teacherOpenCourseMergeSchoolClass.md  | 42 -------------------
 4 files changed, 8 insertions(+), 66 deletions(-)

diff --git a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseMergeSchoolClassDao.java b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseMergeSchoolClassDao.java
index a8ab25f8..6d360e52 100644
--- a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseMergeSchoolClassDao.java
+++ b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseMergeSchoolClassDao.java
@@ -23,6 +23,4 @@ public interface TeacherOpenCourseMergeSchoolClassDao extends BaseMapper<Teacher
     List<TeacherOpenCourseMergeSchoolClass> getByIds(String ids);
     List<TeacherOpenCourseMergeSchoolClass> getValuesByQuery(TeacherOpenCourseMergeSchoolClassQuery teacherOpenCourseMergeSchoolClassQuery);
 
-    @Update
-    void deleteTeacherOpenCourseMergeSchoolClassByCondition(TeacherOpenCourseMergeSchoolClass teacherOpenCourseMergeSchoolClass);
 }
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 ba78490d..4b41272d 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeSchoolClassService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeSchoolClassService.java
@@ -85,15 +85,6 @@ public class TeacherOpenCourseMergeSchoolClassService extends CoreBaseService<Te
         return msg;
     }
 
-    /**
-     * 根据条件删除
-     * @return
-     */
-    public void deleteTeacherOpenCourseMergeSchoolClassByCondition(TeacherOpenCourseMergeSchoolClass teacherOpenCourseMergeSchoolClass) {
-        // 删除开课与班级的关系数据
-        teacherOpenCourseMergeSchoolClassDao.deleteTeacherOpenCourseMergeSchoolClassByCondition(teacherOpenCourseMergeSchoolClass);
-    }
-
     /**
      * 支持导入一个班的学生数据
      * @param schoolClassQuery
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 ec1e4e1a..af018b72 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeSchoolClassController.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeSchoolClassController.java
@@ -150,6 +150,14 @@ public class TeacherOpenCourseMergeSchoolClassController{
         }
     }
 
+
+    /**
+     * 教师端-开课和班级关联
+     * @param teacherOpenCourseMergeSchoolClassQuery
+     * @param result
+     * @param coreUser
+     * @return
+     */
     @PostMapping(MODEL + "/add.json")
     @Function("teacherOpenCourseMergeSchoolClass.add")
     public JsonResult add(@Validated(ValidateConfig.ADD.class) TeacherOpenCourseMergeSchoolClassQuery teacherOpenCourseMergeSchoolClassQuery, BindingResult result,@SCoreUser CoreUser coreUser){
@@ -202,17 +210,4 @@ public class TeacherOpenCourseMergeSchoolClassController{
         teacherOpenCourseMergeSchoolClassService.deleteTeacherOpenCourseMergeSchoolClass(ids);
         return JsonResult.success();
     }
-
-    /**
-     * 根据条件删除开课和老师的关联数据
-     * @param teacherOpenCourseMergeSchoolClass
-     * @return
-     */
-    @PostMapping(MODEL + "/deleteByCondition.json")
-    @Function("teacherOpenCourseMergeSchoolClass.delete")
-    @ResponseBody
-    public JsonResult deleteByCondition(@Validated(TeacherOpenCourseMergeSchoolClass.DELETE_BC.class) TeacherOpenCourseMergeSchoolClass teacherOpenCourseMergeSchoolClass) {
-        teacherOpenCourseMergeSchoolClassService.deleteTeacherOpenCourseMergeSchoolClassByCondition(teacherOpenCourseMergeSchoolClass);
-        return JsonResult.success();
-    }
 }
diff --git a/web/src/main/resources/sql/jlw/teacherOpenCourseMergeSchoolClass.md b/web/src/main/resources/sql/jlw/teacherOpenCourseMergeSchoolClass.md
index e0613181..3cd3b31c 100644
--- a/web/src/main/resources/sql/jlw/teacherOpenCourseMergeSchoolClass.md
+++ b/web/src/main/resources/sql/jlw/teacherOpenCourseMergeSchoolClass.md
@@ -112,48 +112,6 @@ deleteTeacherOpenCourseMergeSchoolClassByIds
   delete from teacher_open_course_merge_school_class where find_in_set(teacher_open_course_merge_school_class_id,#ids#)
 
 
-deleteTeacherOpenCourseMergeSchoolClassByCondition
-===
-
-* 批量删除
-
-  delete from teacher_open_course_merge_school_class where 1 = 1
-  @if(!isEmpty(teacherOpenCourseMergeSchoolClassId)
-    || !isEmpty(teacherOpenCourseMergeSchoolClassIdPlural)
-    || !isEmpty(teacherOpenCourseId)
-    || !isEmpty(teacherOpenCourseIdPlural)
-    || !isEmpty(schoolClassId)
-    || !isEmpty(schoolClassIdPlural)
-    ){
-    and 1 != 1
-    @}
-  @if(!isEmpty(teacherOpenCourseMergeSchoolClassId)){
-  and t.teacher_open_course_merge_school_class_id =#teacherOpenCourseMergeSchoolClassId#
-  @}
-  @if(!isEmpty(teacherOpenCourseMergeSchoolClassIdPlural)){
-  and find_in_set(t.teacher_open_course_merge_school_class_id,#teacherOpenCourseMergeSchoolClassIdPlural#)
-  @}
-  @if(!isEmpty(teacherOpenCourseId)){
-  and t.teacher_open_course_id =#teacherOpenCourseId#
-  @}
-  @if(!isEmpty(teacherOpenCourseIdPlural)){
-  and find_in_set(t.teacher_open_course_id,#teacherOpenCourseIdPlural#)
-  @}
-  @if(!isEmpty(schoolClassId)){
-  and t.school_class_id =#schoolClassId#
-  @}
-  @if(!isEmpty(schoolClassIdPlural)){
-  and find_in_set(t.school_class_id,#schoolClassIdPlural#)
-  @}
-  @if(!isEmpty(teacherOpenCourseMergeSchoolClassStatus)){
-  and t.teacher_open_course_merge_school_class_status =#teacherOpenCourseMergeSchoolClassStatus#
-  @}
-  @if(!isEmpty(teacherOpenCourseMergeSchoolClassStatusPlural)){
-  and find_in_set(t.teacher_open_course_merge_school_class_status,#teacherOpenCourseMergeSchoolClassStatusPlural#)
-  @}
-
-
-
 getByIds
 ===