From cf196b40eb3a5f630096cf0018f9040761cf4f2a Mon Sep 17 00:00:00 2001 From: Mlxa0324 Date: Sat, 14 Jan 2023 00:23:08 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AD=BE=E5=88=B0=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../teacherOpenCourseStudentSigninSetting.md | 21 ++++++++++++++++++- .../index.js | 2 +- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/web/src/main/resources/sql/jlw/teacherOpenCourseStudentSigninSetting.md b/web/src/main/resources/sql/jlw/teacherOpenCourseStudentSigninSetting.md index 8386bfbf..73da28dc 100644 --- a/web/src/main/resources/sql/jlw/teacherOpenCourseStudentSigninSetting.md +++ b/web/src/main/resources/sql/jlw/teacherOpenCourseStudentSigninSetting.md @@ -68,6 +68,16 @@ queryByCondition @if(!isEmpty(userIdPlural)){ and find_in_set(t.user_id,#userIdPlural#) @} + AND ( + EXISTS ( + SELECT + 1 + FROM + school_class a + WHERE + FIND_IN_SET( a.class_id, t.school_class_ids ) + AND a.class_status = 1) OR t.school_class_ids = 'ALL' + ) queryByConditionQuery @@ -137,7 +147,16 @@ queryByConditionQuery @if(!isEmpty(userIdPlural)){ and find_in_set(t.user_id,#userIdPlural#) @} - + AND ( + EXISTS ( + SELECT + 1 + FROM + school_class a + WHERE + FIND_IN_SET( a.class_id, t.school_class_ids ) + AND a.class_status = 1) OR t.school_class_ids = 'ALL' + ) diff --git a/web/src/main/resources/static/js/jlw/teacherOpenCourseStudentSigninSetting/index.js b/web/src/main/resources/static/js/jlw/teacherOpenCourseStudentSigninSetting/index.js index 21bf0af4..167e0f06 100644 --- a/web/src/main/resources/static/js/jlw/teacherOpenCourseStudentSigninSetting/index.js +++ b/web/src/main/resources/static/js/jlw/teacherOpenCourseStudentSigninSetting/index.js @@ -223,7 +223,7 @@ layui.define([ 'form', 'laydate', 'table' ,'laytpl'], function(exports) { Common.downLoad("/jlw/teacherOpenCourseMergeScheduleSession/excel/export.json", formPara, 'POST') */ layer.confirm('是否确定导出签到汇总表吗？', function (index) { - $.downFile(Common.ctxPath + "/jlw/teacherOpenCourseStudentSigninSetting/exportSummary.json",'签到汇总表'); + $.downFile(Common.ctxPath + "/jlw/teacherOpenCourseStudentSigninSetting/exportSummary.json?teacherOpenCourseId=" + teacherOpenCourseId,'签到汇总表'); layer.close(index); }); }