From 3aa01d9d421db1cf045d7ad320c9a86cac5052da Mon Sep 17 00:00:00 2001 From: Mlxa0324 Date: Tue, 15 Nov 2022 22:51:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E6=8E=92=E8=AF=BEID=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E4=B8=80=E4=BA=9B=E5=85=B3=E8=81=94=E8=A1=A8=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/TeacherOpenCourseMergeScheduleSessionDao.java | 7 +++++++ .../jlw/dao/TeacherOpenCourseScheduleSessionDao.java | 4 +++- .../TeacherOpenCourseMergeScheduleSessionService.java | 2 +- .../TeacherOpenCourseScheduleSessionService.java | 11 +++++------ .../TeacherOpenCourseScheduleSessionController.java | 8 ++++++-- .../sql/jlw/teacherOpenCourseMergeScheduleSession.md | 7 +++++++ .../sql/jlw/teacherOpenCourseScheduleSession.md | 3 +++ .../jlw/teacherOpenCourseScheduleSession/add.html | 2 +- 8 files changed, 33 insertions(+), 11 deletions(-) diff --git a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseMergeScheduleSessionDao.java b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseMergeScheduleSessionDao.java index 45a7059f..52121b5b 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseMergeScheduleSessionDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseMergeScheduleSessionDao.java @@ -22,6 +22,13 @@ public interface TeacherOpenCourseMergeScheduleSessionDao extends BaseMapper queryByConditionQuery(PageQuery query); @Update void deleteTeacherOpenCourseMergeScheduleSessionByIds(String ids); + + /** + * 批量删除（根据主表的排课ID） + * @param ids + */ + @Update + void deleteTeacherOpenCourseMergeScheduleSessionByMasterIds(String ids); @Update int updateGivenByIds(TeacherOpenCourseMergeScheduleSessionQuery teacherOpenCourseMergeScheduleSessionQuery); List getByIds(String ids); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseScheduleSessionDao.java b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseScheduleSessionDao.java index ff2b1bcf..35ce2684 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseScheduleSessionDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseScheduleSessionDao.java @@ -35,8 +35,10 @@ interface TeacherOpenCourseScheduleSessionDao extends BaseMapper getSessionNameList(Long teacherOpenCourseId); + List getSessionNameList(Long teacherOpenCourseId, Long teacherId); } diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeScheduleSessionService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeScheduleSessionService.java index 33a7135e..b6f2a5ed 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeScheduleSessionService.java +++ b/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); diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseScheduleSessionService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseScheduleSessionService.java index 3108b607..bec250fc 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseScheduleSessionService.java +++ b/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.TeacherOpenCourseScheduleSessionDao; -import com.ibeetl.jlw.dao.TeacherOpenCourseScheduleSessionSnapDao; -import com.ibeetl.jlw.dao.TeacherOpenCourseScheduleSessionTagDao; +import com.ibeetl.jlw.dao.*; 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 implements DeleteResourcesBy{ @Autowired private TeacherOpenCourseScheduleSessionDao teacherOpenCourseScheduleSessionDao; + @Autowired private TeacherOpenCourseMergeScheduleSessionDao teacherOpenCourseMergeScheduleSessionDao; @Lazy @Autowired TeacherOpenCourseScheduleSessionService teacherOpenCourseScheduleSessionService; @@ -132,6 +130,7 @@ public class TeacherOpenCourseScheduleSessionService extends CoreBaseService getSessionNameList(@NotNull(message = "开课ID不能为空！") Long teacherOpenCourseId) { - return teacherOpenCourseScheduleSessionDao.getSessionNameList(teacherOpenCourseId); + public List getSessionNameList(Long teacherOpenCourseId, Long teacherId) { + return teacherOpenCourseScheduleSessionDao.getSessionNameList(teacherOpenCourseId, teacherId); } diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseScheduleSessionController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseScheduleSessionController.java index 6486d27d..74b66b20 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseScheduleSessionController.java +++ b/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> getSessionNameList(Long teacherOpenCourseId, @SCoreUser CoreUser coreUser) { + public JsonResult> getSessionNameList(Long teacherOpenCourseId, @SCoreUser CoreUser coreUser, @TTeacher Teacher teacher) { if(null == coreUser){ return JsonResult.failMessage("请登录后再操作"); }else{ - List list = teacherOpenCourseScheduleSessionService.getSessionNameList(teacherOpenCourseId); + List list = teacherOpenCourseScheduleSessionService + .getSessionNameList(teacherOpenCourseId, ObjectUtil.defaultIfNull(teacher, new Teacher()).getTeacherId()); return JsonResult.success(list); } } diff --git a/web/src/main/resources/sql/jlw/teacherOpenCourseMergeScheduleSession.md b/web/src/main/resources/sql/jlw/teacherOpenCourseMergeScheduleSession.md index 56352ee0..1e6d0597 100644 --- a/web/src/main/resources/sql/jlw/teacherOpenCourseMergeScheduleSession.md +++ b/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 diff --git a/web/src/main/resources/sql/jlw/teacherOpenCourseScheduleSession.md b/web/src/main/resources/sql/jlw/teacherOpenCourseScheduleSession.md index ec84c8b0..4df873e4 100644 --- a/web/src/main/resources/sql/jlw/teacherOpenCourseScheduleSession.md +++ b/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# @} \ No newline at end of file diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/add.html b/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/add.html index 31fc24d5..c4e3dac5 100644 --- a/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/add.html +++ b/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/add.html @@ -78,7 +78,7 @@
- +