From d89425289910f29e475ff3622f6ff8b40b26db4a Mon Sep 17 00:00:00 2001
From: ndbs <nabs@LAPTOP-FJ5VQJ6J>
Date: Tue, 5 Jul 2022 16:53:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E7=B1=8D=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E5=BC=82=E5=8A=A8=E7=8A=B6=E6=80=81-=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/StuInfoBasic/Index.js                    | 14 +++++++++++++-
 .../StuInfoBasic/StuInfoBasicEntity.cs             | 11 +++++++++++
 .../StuInfoBasicChangeService.cs                   |  4 ++--
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js
index c9cbca4da..b59054e8f 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js	
+++ b/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) {
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs
index b10400a61..1ccbf3288 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs	
+++ b/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  扩展操作
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicChange/StuInfoBasicChangeService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicChange/StuInfoBasicChangeService.cs
index 5fb126220..a3e3e0ede 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicChange/StuInfoBasicChangeService.cs	
+++ b/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}' ");
                     }
 
                     //修改状态