学籍异动类型新增复学；类型为降级时可以选择当前专业下其他班级；

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Form.cshtml

@@ -17,6 +17,18 @@
         <input id="StuName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
 
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasicChange">
+        <div class="lr-form-item-title">异动类型</div>
+        <div id="MoveType"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasicChange">
+        <div class="lr-form-item-title">异动状态</div>
+        <input id="MoveStatus" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasicChange">
+        <div class="lr-form-item-title">异动状态</div>
+        <input id="ChangeStatus" type="text" class="form-control" />
+    </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasicChange">
         <div class="lr-form-item-title">异动类型<font face="宋体">*</font></div>
         <div id="StuChangeType" isvalid="yes" checkexpession="NotNull"></div>
@@ -29,11 +41,11 @@
     <div class="col-xs-12 text-center">学籍原安排</div>
     <div class="col-xs-4 lr-form-item" data-table="StuInfoBasicChange">
         <div class="lr-form-item-title">系部<font face="宋体">*</font></div>
-        <div id="DeptNo"  readonly="readonly"></div>
+        <div id="DeptNo" readonly="readonly"></div>
     </div>
     <div class="col-xs-4 lr-form-item" data-table="StuInfoBasicChange">
         <div class="lr-form-item-title">专业<font face="宋体">*</font></div>
-        <div id="MajorNo"  readonly="readonly"></div>
+        <div id="MajorNo" readonly="readonly"></div>
     </div>
     <div class="col-xs-4 lr-form-item" data-table="StuInfoBasicChange">
         <div class="lr-form-item-title">班级<font face="宋体">*</font></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Form.js

@@ -33,7 +33,7 @@ var bootstrap = function ($, learun) {
                         $("#NewMajorNo").siblings('div').html($("#NewMajorNo").siblings('div').attr('data-title') + '<font face="宋体">*</font>');
                         $("#NewClassNo").siblings('div').html($("#NewClassNo").siblings('div').attr('data-title') + '<font face="宋体">*</font>');
                         $(".NewContainer").show();
-                        if (item.id === "01" || item.id === "02") { //降级、转班
+                        if (item.id === "01" || item.id === "02" || item.id === "07") { //降级、转班、复学
                             $(".NewContainer").find('.contentDiv.zhuanban').removeAttr('readonly');
                             $("#NewDeptNo").lrselectSet($("#DeptNo").lrselectGet());
                             $("#NewMajorNo").lrselectSet($("#MajorNo").lrselectGet());
@@ -54,6 +54,7 @@ var bootstrap = function ($, learun) {
                     }
                 }
             });
+            $('#MoveType').lrDataItemSelect({ code: 'StuChangeType' });
             $('#StuChangeReason').lrDataItemSelect({ code: 'StuChangeReason' });
             $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
             $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' });
@@ -77,12 +78,14 @@ var bootstrap = function ($, learun) {
                 code: 'CdMajorInfo', value: 'majorno', text: 'majorname', select: function (item) {
                     if (item != null && item != undefined) {
                         var gradeWhere = '';
-                        if (!!Grade) {
+                        //异动类型为降级、复学时，不加年级判断条件
+                        var StuChangeType = $('#StuChangeType').lrselectGet();
+                        if (!!Grade && StuChangeType != '01' && StuChangeType != '07') {
                             gradeWhere = "  and Grade='" + Grade + "'";
                         }
                         $('#NewClassNo').lrselectRefresh({
                             url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
-                            param: { strWhere: "MajorNo='" + item.majorno + "' AND CheckMark=1" + gradeWhere+" order by classno" }
+                            param: { strWhere: "MajorNo='" + item.majorno + "' AND CheckMark=1" + gradeWhere + " order by classno" }
                         });
                     } else {
                         //$('#NewClassNo').lrselectRefresh({
@@ -107,6 +110,9 @@ var bootstrap = function ($, learun) {
                             $("#DeptNo").lrselectSet(data.DeptNo);
                             $("#MajorNo").lrselectSet(data.MajorNo);
                             $("#ClassNo").lrselectSet(data.ClassNo);
+                            $("#MoveType").lrselectSet(data.MoveType);
+                            $("#MoveStatus").val(data.MoveStatus);
+                            $("#ChangeStatus").val(data.ChangeStatus);
                             Grade = data.Grade;
                         } else {
                             learun.alert.warning("学生不存在！");
@@ -126,6 +132,9 @@ var bootstrap = function ($, learun) {
                             $("#DeptNo").lrselectSet(data.DeptNo);
                             $("#MajorNo").lrselectSet(data.MajorNo);
                             $("#ClassNo").lrselectSet(data.ClassNo);
+                            $("#MoveType").lrselectSet(data.MoveType);
+                            $("#MoveStatus").val(data.MoveStatus);
+                            $("#ChangeStatus").val(data.ChangeStatus);
                             Grade = data.Grade;
                         } else {
                             learun.alert.warning("学生不存在！");

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

@@ -50,6 +50,21 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("STUCHANGETYPE")]
         public string StuChangeType { get; set; }
         /// <summary>
+        /// 异动类型（旧）
+        /// </summary>
+        [Column("MOVETYPE")]
+        public string MoveType { get; set; }
+        /// <summary>
+        /// 异动状态（旧）
+        /// </summary>
+        [Column("MOVESTATUS")]
+        public string MoveStatus { get; set; }
+        /// <summary>
+        /// 异动状态（旧）
+        /// </summary>
+        [Column("CHANGESTATUS")]
+        public string ChangeStatus { get; set; }
+        /// <summary>
         /// StuChangeReason
         /// </summary>
         [Column("STUCHANGEREASON")]

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

@@ -167,7 +167,16 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                         //改信息；不显示成绩；
                         db.ExecuteBySql($"update StuInfoBasic set ChangeStatus=1,MoveType ='{entity.StuChangeType}',MoveStatus='1' where StuNo='{entity.StuNo}' ");
                     }
-
+                    //2023.3.20新增复学的异动类型
+                    else if (entity.StuChangeType == "07")   //复学
+                    {
+                        //改信息；
+                        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}',MoveType ='{entity.StuChangeType}',MoveStatus='0',ChangeStatus=0 where StuNo='{entity.StuNo}' ");
+                        }
+                    }
                     //修改状态
                     entity.CheckTime = DateTime.Now;
                     entity.CheckUserId = LoginUserInfo.Get().account;
@@ -218,7 +227,16 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                         //改信息；显示成绩；
                         db.ExecuteBySql($"update StuInfoBasic set ChangeStatus=null,MoveType =null,MoveStatus=null where StuNo='{entity.StuNo}' ");
                     }
-
+                    //复学
+                    else if (entity.StuChangeType == "07")
+                    {
+                        //改信息；
+                        var classInfoEntity = db.FindEntity<ClassInfoEntity>(x => x.ClassNo == entity.ClassNo);
+                        if (classInfoEntity != null)
+                        {
+                            db.ExecuteBySql($"update StuInfoBasic set DeptNo='{entity.DeptNo}',MajorNo='{entity.MajorNo}',ClassNo='{entity.ClassNo}',Grade='{classInfoEntity.Grade}',ChangeStatus='{entity.ChangeStatus}',MoveType ='{entity.MoveType}',MoveStatus='{entity.MoveStatus}' where StuNo='{entity.StuNo}' ");
+                        }
+                    }
                     //修改状态
                     db.ExecuteBySql("update StuInfoBasicChange set CheckTime=null,CheckUserId=null,CheckStatus=0 where Id='" + keyValue + "' ");
                 }