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 d014e21c..f9ff882a 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseScheduleSessionDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseScheduleSessionDao.java @@ -36,9 +36,8 @@ interface TeacherOpenCourseScheduleSessionDao extends BaseMapper getSessionNameList(Long teacherOpenCourseId, Long teacherId); +// List getSessionNameList(Long teacherOpenCourseId, Long teacherId); + List getSessionNameList(Long orgId); } 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 555edcbd..a062b3af 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseScheduleSessionService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseScheduleSessionService.java @@ -281,8 +281,17 @@ public class TeacherOpenCourseScheduleSessionService extends CoreBaseService getSessionNameList(Long teacherOpenCourseId, Long teacherId) { - return teacherOpenCourseScheduleSessionDao.getSessionNameList(teacherOpenCourseId, teacherId); +// public List getSessionNameList(Long teacherOpenCourseId, Long teacherId) { +// return teacherOpenCourseScheduleSessionDao.getSessionNameList(teacherOpenCourseId, teacherId); +// } + + /** + * 导入课程,下拉列表 + * @param orgId + * @return + */ + public List getSessionNameList(Long orgId) { + return teacherOpenCourseScheduleSessionDao.getSessionNameList(orgId); } /** 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 2b6625f5..3b231095 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseScheduleSessionController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseScheduleSessionController.java @@ -102,20 +102,37 @@ public class TeacherOpenCourseScheduleSessionController{ } } +// /** +// * 导入课程,下拉列表 +// * @param teacherOpenCourseId +// * @param coreUser +// * @return +// */ +// @GetMapping(API + "/getSessionNameList.do") +// @ResponseBody +// public JsonResult> getSessionNameList(Long teacherOpenCourseId, @SCoreUser CoreUser coreUser, @TTeacher Teacher teacher) { +// if(null == coreUser){ +// return JsonResult.failMessage("请登录后再操作"); +// }else{ +// List list = teacherOpenCourseScheduleSessionService +// .getSessionNameList(teacherOpenCourseId, ObjectUtil.defaultIfNull(teacher, new Teacher()).getTeacherId()); +// return JsonResult.success(list); +// } +// } + /** * 导入课程,下拉列表 - * @param teacherOpenCourseId * @param coreUser * @return */ @GetMapping(API + "/getSessionNameList.do") @ResponseBody - public JsonResult> getSessionNameList(Long teacherOpenCourseId, @SCoreUser CoreUser coreUser, @TTeacher Teacher teacher) { + public JsonResult> getSessionNameList(@SCoreUser CoreUser coreUser) { if(null == coreUser){ return JsonResult.failMessage("请登录后再操作"); }else{ List list = teacherOpenCourseScheduleSessionService - .getSessionNameList(teacherOpenCourseId, ObjectUtil.defaultIfNull(teacher, new Teacher()).getTeacherId()); + .getSessionNameList(coreUser.getOrgId()); return JsonResult.success(list); } } diff --git a/web/src/main/resources/sql/jlw/teacherOpenCourseScheduleSession.md b/web/src/main/resources/sql/jlw/teacherOpenCourseScheduleSession.md index c046eab8..efaf6bc8 100644 --- a/web/src/main/resources/sql/jlw/teacherOpenCourseScheduleSession.md +++ b/web/src/main/resources/sql/jlw/teacherOpenCourseScheduleSession.md @@ -536,11 +536,12 @@ getSessionNameList t.teacher_open_course_schedule_session_id FROM teacher_open_course_schedule_session t - inner JOIN teacher_open_course ta ON ta.teacher_open_course_id = t.teacher_open_course_id + LEFT JOIN teacher_open_course ta ON ta.teacher_open_course_id = t.teacher_open_course_id + LEFT JOIN course_info ci ON ci.course_info_id = t.course_info_id WHERE 1 = 1 AND t.teacher_open_course_schedule_session_status = 1 - AND ta.teacher_open_course_status = 1 + AND (ta.teacher_open_course_status = 1 OR ci.course_info_status = 1) @// 当前时间,小于怕排课的结束时间。才能导入 AND now() < teacher_open_course_schedule_session_end_date @if(!isEmpty(teacherOpenCourseId)){ @@ -549,3 +550,6 @@ getSessionNameList @if(!isEmpty(teacherId)){ and t.teacher_id =#teacherId# @} + @if(!isEmpty(orgId)){ + and t.org_id =#orgId# + @}