Merge branch '长阳分支中职' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 长阳分支中职

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

@@ -324,6 +324,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <returns></returns>
         [Column("REMARK")]
         public string Remark { get; set; }
+        /// <summary>
+        /// StuInfoBasicTran表主键
+        /// </summary>
+        /// <returns></returns>
+        [Column("STUTRANID")]
+        public string StuTranId { get; set; }
         #endregion
 
         #region 扩展操作
@@ -336,8 +342,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             UserInfo userInfo = LoginUserInfo.Get();
             this.CreateTime = DateTime.Now;
             this.CreateUserId = userInfo.userId;
-            this.F_EnabledMark = 0;//0未审核,1已审核 2 作废
-            this.IsReturnSchool = "1";
+            this.F_EnabledMark = 0;//0未审核,1已审核
+            this.IsReturnSchool = "0";
         }
         /// <summary>
         /// 编辑调用

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

@@ -437,6 +437,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
 
                             #region 复制一份学生学籍表
                             copyStuInfoBasic(upTrua, stulist, InsertStuTran);
+                            upTrua.StuTranId = InsertStuTran.Id;
                             InStuinTran.Add(InsertStuTran);
                             #endregion