diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/IndexAccount.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/IndexAccount.js index 77fab9c77..3bd7c35d6 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/IndexAccount.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/IndexAccount.js @@ -114,6 +114,7 @@ var bootstrap = function ($, learun) { }, search: function (param) { param = param || {}; + param.SqlParameter = " and IsEnroll=1 " $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); } }; diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuVolunteer/StuVolunteerEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuVolunteer/StuVolunteerEntity.cs index 2b7b6ba64..d6aef3475 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuVolunteer/StuVolunteerEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuVolunteer/StuVolunteerEntity.cs @@ -64,11 +64,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// [Column("CARDNO")] public string CardNo { get; set; } - ///// - ///// 系所号 - ///// - //[Column("DEPTNO")] - //public string DeptNo { get; set; } + /// + /// 系所号 + /// + [Column("DEPTNO")] + public string DeptNo { get; set; } /// /// 专业 /// @@ -233,18 +233,23 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// /// 是否服从安排 /// + [Column("ISPLAN")] public bool? IsPlan { get; set; } /// /// 准考证号 /// + [Column("EXAMNO")] public string ExamNo { get; set; } /// /// 联系人 /// + [Column("LINKMAN")] public string LinkMan { get; set; } /// /// 联系电话 /// + [Column("LINKPHONE")] + public string LinkPhone { get; set; } #endregion