From 04e32263828a89fc2ee76f1dff44918bb62b578e Mon Sep 17 00:00:00 2001
From: dyy <807692433@qq.com>
Date: Tue, 21 Feb 2023 14:36:17 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E5=AD=A6?=
 =?UTF-8?q?=E7=B1=8D=E5=BC=82=E5=8A=A8=E8=A1=A8=E5=A2=9E=E5=8A=A0StuInfoBa?=
 =?UTF-8?q?sicTran=E8=A1=A8=E4=B8=BB=E9=94=AE=E5=B9=B6=E8=B5=8B=E5=80=BC?=
 =?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../StuTransferInfo/StuTransferInfoEntity.cs           | 10 ++++++++--
 .../StuTransferInfo/StuTransferInfoService.cs          |  1 +
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuTransferInfo/StuTransferInfoEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuTransferInfo/StuTransferInfoEntity.cs
index c5415f322..76cd37659 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuTransferInfo/StuTransferInfoEntity.cs	
+++ b/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>
         /// 编辑调用
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuTransferInfo/StuTransferInfoService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuTransferInfo/StuTransferInfoService.cs
index d1df79818..4b6e4f234 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuTransferInfo/StuTransferInfoService.cs	
+++ b/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