From 397a86ba827fb772c8a28cceecd5ddc244a44d73 Mon Sep 17 00:00:00 2001 From: zhichao lei <442149704@qq.com> Date: Fri, 4 Sep 2020 18:25:35 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=91=E9=9A=85=E6=90=9C=E7=B4=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/StuEnroll/Index.cshtml | 2 +- .../EducationalAdministration/Views/StuEnroll/Index.js | 2 +- .../Views/StuEnroll/Report.cshtml | 2 +- .../Views/StuEnroll/Report.js | 2 +- .../StuEnroll/StuEnrollService.cs | 10 ++++++++++ 5 files changed, 14 insertions(+), 4 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Index.cshtml index e26e5a4e2..ca74e6a86 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Index.cshtml @@ -36,7 +36,7 @@
录取方式
-
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Index.js index e75a6d3f9..d18963b7d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Index.js @@ -86,7 +86,7 @@ var bootstrap = function ($, learun) { value: "classno", text: "classname" }); - $('#EnrollType').lrDataItemSelect({ code: 'EnrollStudentType' }); + $('#Admissions').lrDataItemSelect({ code: 'enrollType' }); //刷新 $('#lr_refresh').on('click', function () { location.reload(); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Report.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Report.cshtml index e2e5b424b..2b58f639f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Report.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Report.cshtml @@ -46,7 +46,7 @@
录取方式
-
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Report.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Report.js index 2af96b0e3..4f6addb42 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Report.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Report.js @@ -22,7 +22,7 @@ var bootstrap = function ($, learun) { value: "year", text: "year", }); - $('#EnrollType').lrDataItemSelect({ code: 'EnrollStudentType' }); + $('#Admissions').lrDataItemSelect({ code: 'enrollType' }); $('#DeptNo').lrselect({ diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollService.cs index 09130bb64..95bc560b0 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollService.cs @@ -126,6 +126,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration dp.Add("RegistrationNo", "%" + queryParam["RegistrationNo"].ToString() + "%", DbType.String); strSql.Append(" AND t.RegistrationNo Like @RegistrationNo "); } + if (!queryParam["Admissions"].IsEmpty()) + { + dp.Add("Admissions", queryParam["Admissions"].ToString() , DbType.String); + strSql.Append(" AND t.Admissions = @Admissions "); + } if (!queryParam["DeptNo"].IsEmpty()) { dp.Add("DeptNo", queryParam["DeptNo"].ToString(), DbType.String); @@ -814,6 +819,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration dp.Add("DeptNo", queryParam["DeptNo"].ToString(), DbType.String); strSql.Append(" AND t.DeptNo = @DeptNo "); } + if (!queryParam["Admissions"].IsEmpty()) + { + dp.Add("Admissions", queryParam["Admissions"].ToString(), DbType.String); + strSql.Append(" AND t.Admissions = @Admissions "); + } if (!queryParam["Grade"].IsEmpty()) { dp.Add("Grade", queryParam["Grade"].ToString(), DbType.String);