学生报名列表修改

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollOfficial/Index.cshtml

@@ -40,7 +40,7 @@
                                 </div>
                                 <div class="col-xs-6 lr-form-item">
                                     <div class="lr-form-item-title">毕业学校</div>
-                                    <input id="FromSchool" type="text" class="form-control" />
+                                    <input id="FromSchool" type="text" class="form-control"/>
                                 </div>
                                 <div class="col-xs-4 lr-form-item">
                                     <div class="lr-form-item-title">户籍所在地</div>
@@ -54,14 +54,22 @@
                                     @*<div class="lr-form-item-title">区</div>*@
                                     <div id="HomeCounty"></div>
                                 </div>
-                                <div class="col-xs-12 lr-form-item">
+                                <div class="col-xs-6 lr-form-item">
                                     <div class="lr-form-item-title">毕业类别</div>
                                     <div id="GraduateType"></div>
                                 </div>
-                                <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">是否服从调剂</div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">服从调剂</div>
                                     <div id="IsAdjust"></div>
                                 </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">提交时间</div>
+                                    <input id="CreateTimeStart" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#CreateTimeStart').trigger('change'); } })" />
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title" style="margin-left: -26px;">至</div>
+                                    <input id="CreateTimeEnd" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#CreateTimeEnd').trigger('change'); } })" />
+                                </div>
                             </div>
                         </div>
                     </div>

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();
         },

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<StuEnrollOfficialEntity>(strSql.ToString(),dp, pagination);
             }
             catch (Exception ex)