From 35a3ea6b3b9cbc6cb09654e6f8a38240f6ba51fb Mon Sep 17 00:00:00 2001 From: liangkun Date: Wed, 7 Jun 2023 11:48:56 +0800 Subject: [PATCH] =?UTF-8?q?=E8=80=83=E5=8A=A1=E6=9F=A5=E8=AF=A2=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/Exam_ExamLesson/Index.cshtml | 4 ++++ .../Views/Exam_ExamLesson/Index.js | 9 +++++++++ .../Views/Exam_ExamRoom/Index.cshtml | 4 ++++ .../Views/Exam_ExamRoom/Index.js | 9 +++++++++ .../Views/Exam_ExamStudent/Index.cshtml | 10 +++++++--- .../Views/Exam_ExamStudent/Index.js | 9 +++++++++ .../Views/Exam_InvigilateTeacher/Index.cshtml | 12 ++++++++---- .../Views/Exam_InvigilateTeacher/Index.js | 9 +++++++++ .../Exam_ExamLesson/Exam_ExamLessonService.cs | 5 +++++ .../Exam_ExamRoom/Exam_ExamRoomService.cs | 5 +++++ .../Exam_ExamStudent/Exam_ExamStudentService.cs | 5 +++++ .../Exam_InvigilateTeacherService.cs | 7 ++++++- .../LearunApp-2.2.0/pages/SSO.7z | Bin 0 -> 2872 bytes 13 files changed, 80 insertions(+), 8 deletions(-) create mode 100644 Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/SSO.7z diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamLesson/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamLesson/Index.cshtml index b23a111f1..d8d798bbb 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamLesson/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamLesson/Index.cshtml @@ -26,6 +26,10 @@
课程名称
+
+
是否启用
+
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamLesson/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamLesson/Index.js index ea88e5f5e..e23743dc9 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamLesson/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamLesson/Index.js @@ -30,6 +30,15 @@ var bootstrap = function ($, learun) { value: 'value', text: 'text' }); + $.get('/Home/GetYearAndSemesteResult', function (ref) { + if (ref.code == "200") { + $('#AcademicYearNo').lrselectSet(ref.data.Item1); + $('#Semester').lrselectSet(ref.data.Item3); + } + }.bind(this), "json"); + $('#ELEnabled').lrDataItemSelect({ + code: "YesOrNoBit" + }); // 刷新 $('#lr_refresh').on('click', function () { location.reload(); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamRoom/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamRoom/Index.cshtml index 05a38db32..edf36d899 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamRoom/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamRoom/Index.cshtml @@ -26,6 +26,10 @@
考场名称
+
+
是否启用
+
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamRoom/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamRoom/Index.js index 922009c4f..9a29882c1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamRoom/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamRoom/Index.js @@ -30,6 +30,15 @@ var bootstrap = function ($, learun) { value: 'value', text: 'text' }); + $.get('/Home/GetYearAndSemesteResult', function (ref) { + if (ref.code == "200") { + $('#AcademicYearNo').lrselectSet(ref.data.Item1); + $('#Semester').lrselectSet(ref.data.Item3); + } + }.bind(this), "json"); + $('#EREnabled').lrDataItemSelect({ + code: "YesOrNoBit" + }); // 刷新 $('#lr_refresh').on('click', function () { location.reload(); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamStudent/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamStudent/Index.cshtml index fdc9285b1..c314b4178 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamStudent/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamStudent/Index.cshtml @@ -26,18 +26,22 @@
年级
-
+
学生学号
-
+
学生名称
-
+
考试类型
+
+
是否启用
+
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamStudent/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamStudent/Index.js index 1ddf2952e..6c3aa7ab6 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamStudent/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamStudent/Index.js @@ -30,6 +30,15 @@ var bootstrap = function ($, learun) { value: 'value', text: 'text' }); + $.get('/Home/GetYearAndSemesteResult', function (ref) { + if (ref.code == "200") { + $('#AcademicYearNo').lrselectSet(ref.data.Item1); + $('#Semester').lrselectSet(ref.data.Item3); + } + }.bind(this), "json"); + $('#ESEnabled').lrDataItemSelect({ + code: "YesOrNoBit" + }); $('#ESType').lrDataItemSelect({ code: 'StudentType' }); // 刷新 $('#lr_refresh').on('click', function () { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_InvigilateTeacher/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_InvigilateTeacher/Index.cshtml index 6edcfcc99..b06d3d1ab 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_InvigilateTeacher/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_InvigilateTeacher/Index.cshtml @@ -10,22 +10,26 @@
-
+
学年
-
+
学期
-
+
教师编号
-
+
教师姓名
+
+
是否启用
+
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_InvigilateTeacher/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_InvigilateTeacher/Index.js index ba0df12a6..e7ade3958 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_InvigilateTeacher/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_InvigilateTeacher/Index.js @@ -32,6 +32,15 @@ var bootstrap = function ($, learun) { value: 'value', text: 'text' }); + $.get('/Home/GetYearAndSemesteResult', function (ref) { + if (ref.code == "200") { + $('#AcademicYearNo').lrselectSet(ref.data.Item1); + $('#Semester').lrselectSet(ref.data.Item3); + } + }.bind(this), "json"); + $('#ITEnabled').lrDataItemSelect({ + code: "YesOrNoBit" + }); // 刷新 $('#lr_refresh').on('click', function () { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamLesson/Exam_ExamLessonService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamLesson/Exam_ExamLessonService.cs index 9c701d454..b3fd1d18a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamLesson/Exam_ExamLessonService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamLesson/Exam_ExamLessonService.cs @@ -49,6 +49,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration dp.Add("Semester", queryParam["Semester"].ToString(), DbType.String); strSql.Append(" AND t.Semester = @Semester "); } + if (!queryParam["ELEnabled"].IsEmpty()) + { + dp.Add("ELEnabled", queryParam["ELEnabled"].ToString(), DbType.String); + strSql.Append(" AND t.ELEnabled = @ELEnabled "); + } if (!queryParam["LessonNo"].IsEmpty()) { dp.Add("LessonNo", "%" + queryParam["LessonNo"].ToString() + "%", DbType.String); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamRoom/Exam_ExamRoomService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamRoom/Exam_ExamRoomService.cs index 0b12a54a3..24e7a7920 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamRoom/Exam_ExamRoomService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamRoom/Exam_ExamRoomService.cs @@ -47,6 +47,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration dp.Add("Semester", queryParam["Semester"].ToString(), DbType.String); strSql.Append(" AND t.Semester = @Semester "); } + if (!queryParam["EREnabled"].IsEmpty()) + { + dp.Add("EREnabled", queryParam["EREnabled"].ToString(), DbType.String); + strSql.Append(" AND t.EREnabled = @EREnabled "); + } if (!queryParam["ClassroomNo"].IsEmpty()) { dp.Add("ClassroomNo", "%" + queryParam["ClassroomNo"].ToString() + "%", DbType.String); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamStudent/Exam_ExamStudentService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamStudent/Exam_ExamStudentService.cs index 74f7aad2f..37c225767 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamStudent/Exam_ExamStudentService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamStudent/Exam_ExamStudentService.cs @@ -49,6 +49,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration dp.Add("Semester", queryParam["Semester"].ToString(), DbType.String); strSql.Append(" AND t.Semester = @Semester "); } + if (!queryParam["ESEnabled"].IsEmpty()) + { + dp.Add("ESEnabled", queryParam["ESEnabled"].ToString(), DbType.String); + strSql.Append(" AND t.ESEnabled = @ESEnabled "); + } if (!queryParam["ClassNo"].IsEmpty()) { dp.Add("ClassNo", queryParam["ClassNo"].ToString(), DbType.String); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_InvigilateTeacher/Exam_InvigilateTeacherService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_InvigilateTeacher/Exam_InvigilateTeacherService.cs index 06988eb79..28a2fa132 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_InvigilateTeacher/Exam_InvigilateTeacherService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_InvigilateTeacher/Exam_InvigilateTeacherService.cs @@ -50,6 +50,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration dp.Add("Semester", queryParam["Semester"].ToString(), DbType.String); strSql.Append(" AND t.Semester = @Semester "); } + if (!queryParam["ITEnabled"].IsEmpty()) + { + dp.Add("ITEnabled", queryParam["ITEnabled"].ToString(), DbType.String); + strSql.Append(" AND t.ITEnabled = @ITEnabled "); + } if (!queryParam["EmpNo"].IsEmpty()) { dp.Add("EmpNo", "%" + queryParam["EmpNo"].ToString() + "%", DbType.String); @@ -361,7 +366,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration ,[EmpNo] ,[ITOrder] ,[ITEnabled]) -select newid(),'{AcademicYearNo}','{Semester}',empname,empno,0,1 from empinfo where checkmark=1 +select newid(),'{AcademicYearNo}','{Semester}',empname,empno,0,1 from empinfo where checkmark=1 and IsHasLesson=1 and IsInActiveStatus=1 and empno not in (select empno from Exam_InvigilateTeacher where AcademicYearNo='{AcademicYearNo}' and Semester='{Semester}') "; return this.BaseRepository("CollegeMIS").ExecuteBySql(sql); diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/SSO.7z b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/SSO.7z new file mode 100644 index 0000000000000000000000000000000000000000..afec6f1e366e9999fb7201333037b20ef4deddbc GIT binary patch literal 2872 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 W0RaVF01yBG41wMX0jx>`tN;KJigvI7 literal 0 HcmV?d00001