diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.cshtml index a0018022b..a9455599d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.cshtml @@ -38,10 +38,43 @@
民族
-
+
身份证号
+
+
审核状态
+
+
+
+
学生编号
+ +
+
+
学籍号
+ +
+
+
政治面貌
+
+
+
+
学制
+
+
+
+
身体状态
+
+
+
+
学习形式
+
+
+
+
上传照片
+
+
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js index 2575064cb..957ab2b27 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js @@ -10,7 +10,7 @@ var bootstrap = function ($, learun) { bind: function () { $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { page.search(queryJson); - }, 300, 400); + }, 450, 400); $('#DeptNo').lrselect({ allowSearch: true, value: "deptno", @@ -70,6 +70,13 @@ var bootstrap = function ($, learun) { $('#GenderNo').lrDataItemSelect({ code: 'usersexbit' }); $('#NationalityNo').lrDataSourceSelect({ code: 'BCdNationality', value: 'nationalityno', text: 'nationality' }); $('#FiveYear').lrDataItemSelect({ code: 'PieceCultivateWay' }); + $('#CheckMark').lrselect({ data: [{ id: '1', text: '已审核' }, { id: '0', text: '未审核' }] }); + $('#PartyFaceNo').lrDataItemSelect({ code: 'PolityStatus' }); + $('#EduSystem').lrDataItemSelect({ code: 'EduSystem' }); + $('#HealthStatus').lrDataItemSelect({ code: 'QRCodeHealthStatus' }); + $('#StudyModality').lrDataItemSelect({ code: 'StudyModality' }); + $('#Photo').lrselect({ data: [{ id: '1', text: '是' }, { id: '0', text: '否' }] }); + // 刷新 $('#lr_refresh').on('click', function () { location.reload(); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs index d71341038..e2b8631b6 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs @@ -103,6 +103,57 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration dp.Add("Remark", "%" + queryParam["Remark"].ToString() + "%", DbType.String); strSql.Append(" AND t.Remark Like @Remark "); } + + if (!queryParam["CheckMark"].IsEmpty()) + { + dp.Add("CheckMark", "" + queryParam["CheckMark"].ToString() + "", DbType.String); + if (queryParam["CheckMark"].ToString() == "1") + { + strSql.Append(" AND t.CheckMark=@CheckMark "); + } + else + { + strSql.Append(" AND (t.CheckMark is null or t.CheckMark='0') "); + } + } + if (!queryParam["StuCode"].IsEmpty()) + { + dp.Add("StuCode", "%" + queryParam["StuCode"].ToString() + "%", DbType.String); + strSql.Append(" AND t.StuCode Like @StuCode "); + } + if (!queryParam["PartyFaceNo"].IsEmpty()) + { + dp.Add("PartyFaceNo", "" + queryParam["PartyFaceNo"].ToString() + "", DbType.String); + strSql.Append(" AND t.PartyFaceNo = @PartyFaceNo "); + } + if (!queryParam["EduSystem"].IsEmpty()) + { + dp.Add("EduSystem", "" + queryParam["EduSystem"].ToString() + "", DbType.String); + strSql.Append(" AND t.EduSystem = @EduSystem "); + } + if (!queryParam["HealthStatus"].IsEmpty()) + { + dp.Add("HealthStatus", "" + queryParam["HealthStatus"].ToString() + "", DbType.String); + strSql.Append(" AND t.HealthStatus = @HealthStatus "); + } + if (!queryParam["StudyModality"].IsEmpty()) + { + dp.Add("StudyModality", "" + queryParam["StudyModality"].ToString() + "", DbType.String); + strSql.Append(" AND t.StudyModality = @StudyModality "); + } + + if (!queryParam["Photo"].IsEmpty()) + { + dp.Add("Photo", "" + queryParam["Photo"].ToString() + "", DbType.String); + if (queryParam["Photo"].ToString() == "1") + { + strSql.Append(" AND t.Photo is not null "); + } + else + { + strSql.Append(" AND t.Photo is null "); + } + } return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination); } catch (Exception ex)