From c7b3cdaa3085fd8af177f2e44532f9ff92643e83 Mon Sep 17 00:00:00 2001 From: liangkun Date: Thu, 1 Jun 2023 10:13:52 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BC=80=E5=85=B3?= =?UTF-8?q?=E6=8E=A7=E5=88=B6=E9=A1=B9=E7=9B=AE=E5=88=9D=E5=A7=8B=E5=8C=96?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/TeachSwitch/Index.cshtml | 4 ++-- .../Views/TeachSwitch/Index.js | 3 ++- .../TeachSwitch/TeachSwitchService.cs | 20 +++++++++++++++++++ 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachSwitch/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachSwitch/Index.cshtml index 0892af2e6..c1c6e4b61 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachSwitch/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachSwitch/Index.cshtml @@ -13,10 +13,10 @@
-  录入 + @* 录入*@  修改  删除 -  打印 + @* 打印*@
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachSwitch/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachSwitch/Index.js index 038692712..a693bad13 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachSwitch/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachSwitch/Index.js @@ -82,8 +82,9 @@ var bootstrap = function ($, learun) { return '微信快捷登录PC端'; } else if (val == 'modifypwdtip') { return '30天未修改密码登录后提示修改'; + }else if (val == 'modifypwdfirstday') { + return '每月1日强制修改密码'; } - } }, { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachSwitch/TeachSwitchService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachSwitch/TeachSwitchService.cs index 97e966393..0d59b2038 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachSwitch/TeachSwitchService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachSwitch/TeachSwitchService.cs @@ -72,6 +72,26 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration jsEntity.Create(); this.BaseRepository().Insert(jsEntity); } + if (!data.Any(a => a.type == "modifypwdfirstday")) + { + var jsEntity = new TeachSwitchEntity() + { + status = "0", + type = "modifypwdfirstday" + }; + jsEntity.Create(); + this.BaseRepository().Insert(jsEntity); + } + if (!data.Any(a => a.type == "modifypwdtip")) + { + var jsEntity = new TeachSwitchEntity() + { + status = "0", + type = "modifypwdtip" + }; + jsEntity.Create(); + this.BaseRepository().Insert(jsEntity); + } var strSql = new StringBuilder(); strSql.Append("SELECT "); strSql.Append(@" From 65776e1079ad359fc50a10ac62bc0b961e457078 Mon Sep 17 00:00:00 2001 From: ndbs Date: Tue, 6 Jun 2023 16:08:04 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=80=83=E5=8A=A1=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E8=80=83=E8=AF=95=E5=AD=A6=E7=94=9F=E7=AE=A1=E7=90=86=EF=BC=8C?= =?UTF-8?q?=E6=A3=80=E7=B4=A2=E6=9D=A1=E4=BB=B6=E5=A2=9E=E5=8A=A0=E5=B9=B4?= =?UTF-8?q?=E7=BA=A7=E6=A3=80=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/Exam_ExamStudent/Index.cshtml | 6 +++++- .../Exam_ExamStudent/Exam_ExamStudentService.cs | 5 +++++ 2 files changed, 10 insertions(+), 1 deletion(-) 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 00ee8dad1..fdc9285b1 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 @@ -18,10 +18,14 @@
学期
-
+
班级
+
+
年级
+ +
学生学号
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 d28bbd245..74f7aad2f 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 @@ -54,6 +54,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration dp.Add("ClassNo", queryParam["ClassNo"].ToString(), DbType.String); strSql.Append(" AND t.ClassNo = @ClassNo "); } + if (!queryParam["Grade"].IsEmpty()) + { + dp.Add("Grade", queryParam["Grade"].ToString(), DbType.String); + strSql.Append(" AND t.Grade = @Grade "); + } if (!queryParam["StuNo"].IsEmpty()) { dp.Add("StuNo", "%" + queryParam["StuNo"].ToString() + "%", DbType.String);