diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollOfficial/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollOfficial/Index.cshtml
index 009d7e537..b652e52a7 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollOfficial/Index.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollOfficial/Index.cshtml
@@ -40,7 +40,7 @@
-
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollOfficial/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollOfficial/Index.js
index 357e15253..0b11e985e 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollOfficial/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollOfficial/Index.js
@@ -233,58 +233,6 @@ var bootstrap = function ($, learun) {
});
}
},
- //{
- // label: "报考专业(二)", name: "MajorNo2", width: 100, align: "left",
- // formatterAsync: function (callback, value, row, op, $cell) {
- // learun.clientdata.getAsync('custmerData', {
- // url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
- // key: value,
- // keyId: 'majorno',
- // callback: function (_data) {
- // callback(_data['majorname']);
- // }
- // });
- // }
- //},
- //{
- // label: "报考专业(三)", name: "MajorNo3", width: 100, align: "left",
- // formatterAsync: function (callback, value, row, op, $cell) {
- // learun.clientdata.getAsync('custmerData', {
- // url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
- // key: value,
- // keyId: 'majorno',
- // callback: function (_data) {
- // callback(_data['majorname']);
- // }
- // });
- // }
- //},
- //{
- // label: "报考专业(四)", name: "MajorNo4", width: 100, align: "left",
- // formatterAsync: function (callback, value, row, op, $cell) {
- // learun.clientdata.getAsync('custmerData', {
- // url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
- // key: value,
- // keyId: 'majorno',
- // callback: function (_data) {
- // callback(_data['majorname']);
- // }
- // });
- // }
- //},
- //{
- // label: "报考专业(五)", name: "MajorNo5", width: 100, align: "left",
- // formatterAsync: function (callback, value, row, op, $cell) {
- // learun.clientdata.getAsync('custmerData', {
- // url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
- // key: value,
- // keyId: 'majorno',
- // callback: function (_data) {
- // callback(_data['majorname']);
- // }
- // });
- // }
- //},
{
label: "户籍所在地", name: "HomeProvince", width: 200, align: "left",
formatter: function (value, row) {
@@ -384,7 +332,10 @@ var bootstrap = function ($, learun) {
},
],
mainId: 'Id',
- isPage: true
+ isPage: true,
+ sidx: 'CreateTime',
+ sord: 'ASC'
+
});
page.search();
},
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnrollOfficial/StuEnrollOfficialService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnrollOfficial/StuEnrollOfficialService.cs
index 21fddb3a0..3ad5bdbee 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnrollOfficial/StuEnrollOfficialService.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnrollOfficial/StuEnrollOfficialService.cs
@@ -104,6 +104,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
dp.Add("IsAdjust",queryParam["IsAdjust"].ToString(), DbType.String);
strSql.Append(" AND t.IsAdjust = @IsAdjust ");
}
+ if (!queryParam["CreateTimeStart"].IsEmpty() && !queryParam["CreateTimeEnd"].IsEmpty())
+ {
+ dp.Add("CreateTimeStart", queryParam["CreateTimeStart"].ToDate(), DbType.DateTime);
+ dp.Add("CreateTimeEnd", queryParam["CreateTimeEnd"].ToDate(), DbType.DateTime);
+ strSql.Append(" AND ( t.CreateTime >= @CreateTimeStart AND t.CreateTime <= @CreateTimeEnd ) ");
+ }
return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(),dp, pagination);
}
catch (Exception ex)