diff --git a/web/src/main/java/com/ibeetl/jlw/service/StatisticalAnalysisService.java b/web/src/main/java/com/ibeetl/jlw/service/StatisticalAnalysisService.java index e28041fa..5a0990fb 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/StatisticalAnalysisService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/StatisticalAnalysisService.java @@ -96,8 +96,10 @@ public class StatisticalAnalysisService { "不及格".equals(v.getLastStatus()) || "E".equals(v.getLastStatus())).count(); long l = scoreDashboards.size() - count1; data.put("passRate", NumberUtil.formatPercent(NumberUtil.div(l,scoreDashboards.size()), 0)); + data.put("studentPassNum",l ); }else { data.put("passRate", "0%"); + data.put("studentPassNum", 0); } //授课视频 TeacherOpenCourseMergeCourseInfoQuery courseInfoQuery = new TeacherOpenCourseMergeCourseInfoQuery(); diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseNoticeService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseNoticeService.java index 6d2a1805..a43fda82 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseNoticeService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseNoticeService.java @@ -232,6 +232,7 @@ public class TeacherOpenCourseNoticeService extends CoreBaseService noticeList = teacherOpenCourseNoticeDao.getValuesByQueryNotWithPermission(noticeQuery); if (CollectionUtil.isEmpty(noticeList)) { return JsonResult.success(0); diff --git a/web/src/main/resources/sql/jlw/teacherOpenCourseStudentSigninLog.md b/web/src/main/resources/sql/jlw/teacherOpenCourseStudentSigninLog.md index b2989e99..7c874f7b 100644 --- a/web/src/main/resources/sql/jlw/teacherOpenCourseStudentSigninLog.md +++ b/web/src/main/resources/sql/jlw/teacherOpenCourseStudentSigninLog.md @@ -97,7 +97,7 @@ queryByConditionQuery and find_in_set(t.teacher_open_course_student_signin_setting_id,#teacherOpenCourseStudentSigninSettingIdPlural#) @} @if(!isEmpty(teacherOpenCourseStudentSigninSettingSessionTime)){ - and t.teacher_open_course_student_signin_setting_session_time =#teacherOpenCourseStudentSigninSettingSessionTime# + and SUBSTRING(t.teacher_open_course_student_signin_setting_session_time,1,10) =#teacherOpenCourseStudentSigninSettingSessionTime# @} @if(!isEmpty(studentId)){ and t.student_id =#studentId# diff --git a/web/src/main/resources/templates/jlw/schoolClass/add.html b/web/src/main/resources/templates/jlw/schoolClass/add.html index 6dbc7c5f..37608182 100644 --- a/web/src/main/resources/templates/jlw/schoolClass/add.html +++ b/web/src/main/resources/templates/jlw/schoolClass/add.html @@ -74,7 +74,8 @@
- +
diff --git a/web/src/main/resources/templates/jlw/teacher/importPage.html b/web/src/main/resources/templates/jlw/teacher/importPage.html index 9cd4c88c..fa642689 100644 --- a/web/src/main/resources/templates/jlw/teacher/importPage.html +++ b/web/src/main/resources/templates/jlw/teacher/importPage.html @@ -138,7 +138,7 @@ }); $("#addButton").click(function(){ - + Lib.closeFrame(); }); $("#addButton-cancel").click(function(){ diff --git a/web/src/main/resources/templates/jlw/universitiesColleges/add.html b/web/src/main/resources/templates/jlw/universitiesColleges/add.html index 6f97a61a..d80f4766 100644 --- a/web/src/main/resources/templates/jlw/universitiesColleges/add.html +++ b/web/src/main/resources/templates/jlw/universitiesColleges/add.html @@ -11,7 +11,8 @@
- +
diff --git a/web/src/main/resources/templates/jlw/universitiesCollegesJurisdictionExperimentalSystem/add.html b/web/src/main/resources/templates/jlw/universitiesCollegesJurisdictionExperimentalSystem/add.html index 896edbf6..d166a32d 100644 --- a/web/src/main/resources/templates/jlw/universitiesCollegesJurisdictionExperimentalSystem/add.html +++ b/web/src/main/resources/templates/jlw/universitiesCollegesJurisdictionExperimentalSystem/add.html @@ -52,7 +52,7 @@
- +
@@ -78,7 +78,7 @@ {{# layui.each(d.list, function(index, item){ }} + lay-skin="primary" lay-filter="select_xt" value="{{item.typeId}}">
{{item.applicationName}} diff --git a/web/src/main/resources/templates/jlw/universitySystem/add.html b/web/src/main/resources/templates/jlw/universitySystem/add.html index 80ec8173..4342dc42 100644 --- a/web/src/main/resources/templates/jlw/universitySystem/add.html +++ b/web/src/main/resources/templates/jlw/universitySystem/add.html @@ -31,6 +31,7 @@