根据排课ID删除一些关联表。

web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseMergeScheduleSessionDao.java

@@ -22,6 +22,13 @@ public interface TeacherOpenCourseMergeScheduleSessionDao extends BaseMapper<Tea
     PageQuery<TeacherOpenCourseMergeScheduleSession> queryByConditionQuery(PageQuery query);
     @Update
     void deleteTeacherOpenCourseMergeScheduleSessionByIds(String ids);
+
+    /**
+     * 批量删除（根据主表的排课ID）
+     * @param ids
+     */
+    @Update
+    void deleteTeacherOpenCourseMergeScheduleSessionByMasterIds(String ids);
     @Update
     int updateGivenByIds(TeacherOpenCourseMergeScheduleSessionQuery teacherOpenCourseMergeScheduleSessionQuery);
     List<TeacherOpenCourseMergeScheduleSession> getByIds(String ids);

web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseScheduleSessionDao.java

@@ -35,8 +35,10 @@ interface TeacherOpenCourseScheduleSessionDao extends BaseMapper<TeacherOpenCour
 
     /**
      * 导入课程，下拉列表
+     *
      * @param teacherOpenCourseId
+     * @param teacherId
      * @return
      */
-    List<Map> getSessionNameList(Long teacherOpenCourseId);
+    List<Map> getSessionNameList(Long teacherOpenCourseId, Long teacherId);
 }

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

@@ -317,7 +317,7 @@ public class TeacherOpenCourseMergeScheduleSessionService extends CoreBaseServic
         for (String id : teacherOpenCourseScheduleSessionIds.split(",")) {
             Long teacherOpenCourseScheduleSessionId = Long.valueOf(id);
             TeacherOpenCourseScheduleSession info = teacherOpenCourseScheduleSessionService.getInfo(teacherOpenCourseScheduleSessionId);
-            query.setTeacherOpenCourseMergeScheduleSessionId(teacherOpenCourseScheduleSessionId);
+            query.setTeacherOpenCourseScheduleSessionId(teacherOpenCourseScheduleSessionId);
             query.setTeacherOpenCourseMergeScheduleSessionStatus(1);
             query.setTeacherOpenCourseId(info.getTeacherOpenCourseId());
             long count = teacherOpenCourseMergeScheduleSessionDao.templateCount(query);

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

@@ -20,10 +20,7 @@ import com.ibeetl.admin.core.util.holidays.Holidays;
 import com.ibeetl.admin.core.util.holidays.HolidaysUtils;
 import com.ibeetl.admin.core.web.JsonResult;
 import com.ibeetl.admin.core.web.JsonReturnCode;
-import com.ibeetl.jlw.dao.TeacherOpenCourseScheduleSessionClassDao;
+import com.ibeetl.jlw.dao.*;
-import com.ibeetl.jlw.dao.TeacherOpenCourseScheduleSessionDao;
-import com.ibeetl.jlw.dao.TeacherOpenCourseScheduleSessionSnapDao;
-import com.ibeetl.jlw.dao.TeacherOpenCourseScheduleSessionTagDao;
 import com.ibeetl.jlw.entity.TeacherOpenCourseScheduleSession;
 import com.ibeetl.jlw.entity.TeacherOpenCourseScheduleSessionClass;
 import com.ibeetl.jlw.entity.TeacherOpenCourseScheduleSessionOptions;
@@ -67,6 +64,7 @@ import static java.util.stream.Collectors.toMap;
 public class TeacherOpenCourseScheduleSessionService extends CoreBaseService<TeacherOpenCourseScheduleSession> implements DeleteResourcesBy{
 
     @Autowired private TeacherOpenCourseScheduleSessionDao teacherOpenCourseScheduleSessionDao;
+    @Autowired private TeacherOpenCourseMergeScheduleSessionDao teacherOpenCourseMergeScheduleSessionDao;
 
     @Lazy
     @Autowired TeacherOpenCourseScheduleSessionService teacherOpenCourseScheduleSessionService;
@@ -132,6 +130,7 @@ public class TeacherOpenCourseScheduleSessionService extends CoreBaseService<Tea
         try {
             teacherOpenCourseScheduleSessionDao.deleteByIds(ids);
             teacherOpenCourseScheduleSessionSnapDao.deleteTeacherOpenCourseScheduleSessionBySessionIds(ids);
+            teacherOpenCourseMergeScheduleSessionDao.deleteTeacherOpenCourseMergeScheduleSessionByMasterIds(ids);
         } catch (Exception e) {
             throw new PlatformException("批量删除新增排课失败", e);
         }
@@ -307,8 +306,8 @@ public class TeacherOpenCourseScheduleSessionService extends CoreBaseService<Tea
      * @param teacherOpenCourseId
      * @return
      */
-    public List<Map> getSessionNameList(@NotNull(message = "开课ID不能为空！") Long teacherOpenCourseId) {
+    public List<Map> getSessionNameList(Long teacherOpenCourseId, Long teacherId) {
-        return teacherOpenCourseScheduleSessionDao.getSessionNameList(teacherOpenCourseId);
+        return teacherOpenCourseScheduleSessionDao.getSessionNameList(teacherOpenCourseId, teacherId);
     }
 
 

web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseScheduleSessionController.java

@@ -1,11 +1,14 @@
 package com.ibeetl.jlw.web;
 
+import cn.hutool.core.util.ObjectUtil;
 import cn.jlw.Interceptor.SCoreUser;
+import cn.jlw.Interceptor.TTeacher;
 import cn.jlw.validate.ValidateConfig;
 import com.ibeetl.admin.core.annotation.Function;
 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.Teacher;
 import com.ibeetl.jlw.entity.TeacherOpenCourseScheduleSession;
 import com.ibeetl.jlw.entity.TeacherOpenCourseScheduleSessionClass;
 import com.ibeetl.jlw.entity.TeacherOpenCourseScheduleSessionOptions;
@@ -101,11 +104,12 @@ public class TeacherOpenCourseScheduleSessionController{
      */
     @GetMapping(API + "/getSessionNameList.do")
     @ResponseBody
-    public JsonResult<List<Map>> getSessionNameList(Long teacherOpenCourseId, @SCoreUser CoreUser coreUser) {
+    public JsonResult<List<Map>> getSessionNameList(Long teacherOpenCourseId, @SCoreUser CoreUser coreUser, @TTeacher Teacher teacher) {
         if(null == coreUser){
             return JsonResult.failMessage("请登录后再操作");
         }else{
-            List<Map> list = teacherOpenCourseScheduleSessionService.getSessionNameList(teacherOpenCourseId);
+            List<Map> list = teacherOpenCourseScheduleSessionService
+                    .getSessionNameList(teacherOpenCourseId, ObjectUtil.defaultIfNull(teacher, new Teacher()).getTeacherId());
             return  JsonResult.success(list);
         }
     }

web/src/main/resources/sql/jlw/teacherOpenCourseMergeScheduleSession.md

@@ -99,6 +99,13 @@ deleteTeacherOpenCourseMergeScheduleSessionByIds
 
   delete from teacher_open_course_merge_schedule_session where find_in_set(teacher_open_course_merge_schedule_session_id,#ids#)
 
+deleteTeacherOpenCourseMergeScheduleSessionByMasterIds
+===
+
+* 批量删除（根据主表的排课ID）
+
+  delete from teacher_open_course_merge_schedule_session where find_in_set(teacher_open_course_schedule_session_id,#ids#)
+
 
 
 getByIds

web/src/main/resources/sql/jlw/teacherOpenCourseScheduleSession.md

@@ -518,4 +518,7 @@ getSessionNameList
     AND t.teacher_open_course_schedule_session_status = 1
   @if(!isEmpty(teacherOpenCourseId)){
   and t.teacher_open_course_id =#teacherOpenCourseId#
+  @}
+  @if(!isEmpty(teacherId)){
+  and t.teacher_id =#teacherId#
   @}

web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/add.html

@@ -78,7 +78,7 @@
 		<div class="layui-form-item">
 			<label class="layui-form-label">开课节次</label>
 			<div class="layui-inline" style="width: 50%;">
-<!--				<input id="kkJieciTableCheckBoxIds" value='${mapUtil.getPath(teacherOpenCourseScheduleSession.teacherOpenCourseScheduleSessionClassList, "$..teacherOpenCourseScheduleSessionTagId")}'/>-->
+<!--	mapUtil.getPath(teacherOpenCourseScheduleSession.teacherOpenCourseScheduleSessionClassList, "$..teacherOpenCourseScheduleSessionTagId") -->
 				<table id="kkJieciTable" class="layui-table" name="sessionTagList" lay-filter="kkJieciTable"
 					   data-value='${teacherOpenCourseScheduleSession.teacherOpenCourseScheduleSessionClassList}'></table>
 			</div>