学籍移动审核页面修改

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuTransferInfoController.cs

@@ -181,7 +181,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         /// <param name="entity">实体</param>
         /// <returns></returns>
         [HttpPost]
-        //[ValidateAntiForgeryToken]
+        [ValidateAntiForgeryToken]
         [AjaxOnly]
         public ActionResult SaveForm(StuTransferInfoEntity entity, string strStuEntity)
         {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/CheckIndex.js

@@ -29,6 +29,12 @@ var bootstrap = function ($, learun) {
             $('#CheckUserId').lrDataSourceSelect({ code: 'teacheruserdata', value: 'f_encode', text: 'f_realname' });
             $('#CreateUserId').lrDataSourceSelect({ code: 'teacheruserdata', value: 'f_encode', text: 'f_realname' });
             $('#F_EnabledMark').lrDataItemSelect({ code: 'YesOrNoInt' });
+
+            $('#F_EnabledMark').lrselect({
+                data: [{ text: "作废", value: "0" }, { text: "未审核", value: "1" }, { text: "已审核", value: "2" }],
+                text: "text",
+                value: "value"
+            })
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
@@ -80,9 +86,14 @@ var bootstrap = function ($, learun) {
                 headData: [
                     { label: '姓名', name: 'StuName', width: 100, align: "left" },
                     { label: '学号', name: 'StuNo', width: 150, align: "left" },
-                    { label: '性别', name: 'Gender', width: 100, align: "left" },
                     {
-                        label: '异动类型', name: 'AnomalousType', width: 150, align: "left",
+                        label: '性别', name: 'Gender', width: 80, align: "left",
+                        formatter: function (cellvalue) {
+                            return cellvalue == true ? "男" : "女";
+                        }
+                    },
+                    {
+                        label: '异动类型', name: 'AnomalousType', width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {
                                 key: value,
@@ -106,7 +117,7 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     //{ label: '身份证号', name: 'IdentityCardNo', width: 160, align: "left" },
-                    
+
                     {
                         label: '异动前班级', name: 'ClassNo', width: 140, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
@@ -159,7 +170,7 @@ var bootstrap = function ($, learun) {
                     //        });
                     //    }
                     //},
-                    
+
                     {
                         label: '异动后班级', name: 'NewClassNo', width: 140, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
@@ -242,7 +253,13 @@ var bootstrap = function ($, learun) {
                     {
                         label: '审核状态', name: 'F_EnabledMark', width: 100, align: "left",
                         formatter: function (cellvalue) {
-                            return cellvalue == "1" ? "<span class=\"label label-success\">已审核</span>" : "<span class=\"label label-danger\">未审核</span>";
+                            if (cellvalue == "0") {
+                                return "<span class=\"label label-danger\">未审核</span>";
+                            } else if (cellvalue == "1") {
+                                return "<span class=\"label label-success\">已审核</span>";
+                            } else if (cellvalue == "2") {
+                                return "<span class=\"label label-default\">作废</span>";
+                            }
                         }
                     },
                     {
@@ -329,7 +346,7 @@ var bootstrap = function ($, learun) {
                 mainId: 'ID',
                 isPage: true,
                 rows: 100,
-                sidx: 'F_EnabledMark asc,CreateUserId asc',
+                sidx: 'F_EnabledMark asc,CreateUserId asc,CreateTime desc',
                 isMultiselect: true
             });
             page.search();

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuTransferInfo/StuTransferInfoEntity.cs

@@ -159,7 +159,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("CHECKUSERID")]
         public string CheckUserId { get; set; }
         /// <summary>
-        /// 审核状态0否1是
+        /// 审核状态//0未审核,1已审核 2 作废
         /// </summary>
         /// <returns></returns>
         [Column("F_ENABLEDMARK")]
@@ -336,7 +336,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             UserInfo userInfo = LoginUserInfo.Get();
             this.CreateTime = DateTime.Now;
             this.CreateUserId = userInfo.userId;
-            this.F_EnabledMark = 0;//审核状态默认为未审核
+            this.F_EnabledMark = 0;//0未审核,1已审核 2 作废
             this.IsReturnSchool = "1";
         }
         /// <summary>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuTransferInfo/StuTransferInfoService.cs

@@ -103,7 +103,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     dp.Add("StuStatus", queryParam["StuStatus"].ToString(), DbType.String);
                     strSql.Append(" AND t.StuStatus = @StuStatus ");
                 }
-                return this.BaseRepository("CollegeMIS").FindList<StuTransferInfoEntity>(strSql.ToString(), pagination);
+                return this.BaseRepository("CollegeMIS").FindList<StuTransferInfoEntity>(strSql.ToString(), dp, pagination);
             }
             catch (Exception ex)
             {
@@ -226,7 +226,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 {
                     var InsertEntity = new StuTransferInfoEntity();
                     //历史数据
-                    //InsertEntity.ID = Guid.NewGuid().ToString();
                     InsertEntity.StuId = item.StuId;
                     InsertEntity.StuNo = item.StuNo;
                     InsertEntity.StuName = item.StuName;
@@ -245,7 +244,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     InsertEntity.NewDeptNo = entity.NewDeptNo;
                     InsertEntity.NewGrade = entity.NewGrade;
                     InsertEntity.LeaveDate = entity.LeaveDate;
-                    InsertEntity.StuStatus = entity.StuStatus;
+                    InsertEntity.ChangeReason = entity.Remark;
                     //
                     InsertEntity.StuStatus = entity.StuStatus;
                     InsertEntity.F_WriteMark = entity.F_WriteMark;