学籍管理 异动状态-类型

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js

@@ -351,11 +351,23 @@ var bootstrap = function ($, learun) {
                     { label: "户口所在地", name: "FatherUnit", width: 100, align: "left" },
                     { label: "档案所在地", name: "MatherUnit", width: 100, align: "left" },
                     {
-                        label: "异动状态", name: "AbmormityMoveMark", width: 80, align: "center",
+                        label: "异动状态", name: "MoveStatus", width: 80, align: "center",
                         formatter: function (cellvalue) {
                             return cellvalue == "1" ? "<i class=\"fa fa-toggle-on\"></i>" : "<i class=\"fa fa-toggle-off\"></i>";
                         }
                     },
+                    {
+                        label: "异动类型", name: "MoveType", width: 100, align: "left" ,
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'StuChangeType',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
                     {
                         label: "审核状态", name: "CheckMark", width: 80, align: "center",
                         formatter: function (cellvalue) {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs

@@ -764,6 +764,17 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// </summary> 
         [Column("THREEMOBILE")]
         public string ThreeMobile { get; set; }
+        /// <summary> 
+        /// 异动类型
+        /// </summary> 
+        [Column("MOVETYPE")]
+        public string MoveType { get; set; }        
+        /// <summary> 
+        /// 异动状态 
+        /// </summary> 
+        [Column("MOVESTATUS")]
+        public int? MoveStatus { get; set; }
+
         #endregion
 
         #region  扩展操作

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicChange/StuInfoBasicChangeService.cs

@@ -159,13 +159,13 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                         var classInfoEntity = db.FindEntity<ClassInfoEntity>(x => x.ClassNo == entity.NewClassNo);
                         if (classInfoEntity != null)
                         {
-                            db.ExecuteBySql($"update StuInfoBasic set DeptNo='{entity.NewDeptNo}',MajorNo='{entity.NewMajorNo}',ClassNo='{entity.NewClassNo}',Grade='{classInfoEntity.Grade}' where StuNo='{entity.StuNo}' ");
+                            db.ExecuteBySql($"update StuInfoBasic set DeptNo='{entity.NewDeptNo}',MajorNo='{entity.NewMajorNo}',ClassNo='{entity.NewClassNo}',Grade='{classInfoEntity.Grade}',MoveType ='{entity.StuChangeType}',MoveStatus='1' where StuNo='{entity.StuNo}' ");
                         }
                     }
                     else if (entity.StuChangeType == "04" || entity.StuChangeType == "05")  //退学、休学
                     {
                         //改信息；不显示成绩；
-                        db.ExecuteBySql($"update StuInfoBasic set ChangeStatus=1 where StuNo='{entity.StuNo}' ");
+                        db.ExecuteBySql($"update StuInfoBasic set ChangeStatus=1,MoveType ='{entity.StuChangeType}',MoveStatus='1' where StuNo='{entity.StuNo}' ");
                     }
 
                     //修改状态