From 00dbebf5e61a1f0a6699dea209aab6aaeb690d61 Mon Sep 17 00:00:00 2001 From: yangdj <18302547071@163> Date: Fri, 24 Feb 2023 22:51:41 +0800 Subject: [PATCH 1/6] 1 --- web/src/main/resources/templates/jlw/teacher/importPage.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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(){ From b16e0201c1895d7cd7e9612ce6515233dca898b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9A=E4=B8=B9ab?= <1421553879@qq.com> Date: Sat, 25 Feb 2023 00:47:07 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E9=99=A2=E6=A0=A1=E6=9D=83=E9=99=90?= =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../add.html | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) 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/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/universityFaculty/add.html b/web/src/main/resources/templates/jlw/universityFaculty/add.html index e1ae33d3..6f9750ee 100644 --- a/web/src/main/resources/templates/jlw/universityFaculty/add.html +++ b/web/src/main/resources/templates/jlw/universityFaculty/add.html @@ -20,6 +20,7 @@
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 @@
From 7f17931ce685b7fac5f6d9a3302d180bf647b0f9 Mon Sep 17 00:00:00 2001 From: yangdj <18302547071@163> Date: Sat, 25 Feb 2023 16:33:37 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=BD=93=E5=A4=A9=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/sql/jlw/teacherOpenCourseStudentSigninLog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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# From e6679a4b47633dbd53199cf46932b96ba502281d Mon Sep 17 00:00:00 2001 From: xuliangtong <1124839262@qq.com> Date: Sat, 25 Feb 2023 20:49:50 +0800 Subject: [PATCH 5/6] 1 --- .../java/com/ibeetl/jlw/service/StatisticalAnalysisService.java | 2 ++ 1 file changed, 2 insertions(+) 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(); From 14d640129500bdc33eaaf13b3e6f1159c78b8753 Mon Sep 17 00:00:00 2001 From: xuliangtong <1124839262@qq.com> Date: Sat, 25 Feb 2023 21:00:50 +0800 Subject: [PATCH 6/6] 1 --- .../com/ibeetl/jlw/service/TeacherOpenCourseNoticeService.java | 1 + 1 file changed, 1 insertion(+) 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);