学籍异动 休学复学数据未做关联

学籍异动转入学籍信息保存失败 等js页面调整

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/DropOutIndex.cshtml

@@ -80,7 +80,7 @@
                 </div>
                 <div class="col-xs-12 lr-form-item">
                     <div class="lr-form-item-title">异动原因</div>
-                    <textarea id="Remark" class="form-control" style="height: 100px;"></textarea>
+                    <textarea id="ChangeReason" class="form-control" style="height: 100px;"></textarea>
                 </div>
             </div>
             <div id="subbtn" style="margin:0 auto;cursor:pointer;margin-bottom:10px; position:relative; width:80px; height:28px;line-height:28px;border-radius:4px; background:#039cfd;color:#FFF;text-align:center;">

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

@@ -176,7 +176,7 @@ var bootstrap = function ($, learun) {
                     { label: '姓名', name: 'StuName', width: 100, align: "left" },
                     { label: '学号', name: 'StuNo', width: 160, align: "left" },
                     {
-                        label: "性别", name: "GenderNo", width: 80, align: "left",
+                        label: "性别", name: "Gender", width: 80, align: "left",
                         formatter: function (cellvalue) {
                             return cellvalue == true ? "男" : "女";
                         }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/MajorIndex.cshtml

@@ -112,7 +112,7 @@
                 </div>*@
                 <div class="col-xs-12 lr-form-item">
                     <div class="lr-form-item-title">异动原因</div>
-                    <textarea id="Remark" class="form-control" style="height: 100px;"></textarea>
+                    <textarea id="ChangeReason" class="form-control" style="height: 100px;"></textarea>
                 </div>
             </div>
 

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RestAgainIndex.cshtml

@@ -133,19 +133,19 @@
                             <div class="lr-form-item-title">休学年限<font face="宋体">*</font></div>
                             <input id="SuspensionPeriod" class="form-control" type="text" isvalid="yes" checkexpession="NotNull" />
                         </div>
-                        <div class="col-xs-2 lr-form-item">
+                        <div class="col-xs-2 lr-form-item"> 
                             <div class="lr-form-item-title">休学时段<font face="宋体">*</font></div>
                             <input id="SuspensionBeginTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({maxDate:'#F{$dp.$D(\'SuspensionEndTime\',{d:-3});}', dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#SuspensionBeginTime').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
 
                         </div>
-                        <div class="col-xs-2 lr-form-item" style="padding-left:25px;">
-                            <div class="lr-form-item-title" style="width:25px;">至<font face="宋体">*</font></div>
+                        <div class="col-xs-2 lr-form-item">
+                            <div class="lr-form-item-title" style="width:25px;">    至<font face="宋体">*</font></div>
                             <input id="SuspensionEndTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({minDate:'#F{$dp.$D(\'SuspensionBeginTime\',{d:3})}', dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#SuspensionEndTime').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
 
                         </div>
                         <div class="col-xs-12 lr-form-item">
                             <div class="lr-form-item-title">异动原因</div>
-                            <textarea id="Remark" class="form-control" style="height: 100px;"></textarea>
+                            <textarea id="ChangeReason" class="form-control" style="height: 100px;"></textarea>
                         </div>
 
                     </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RestAgainIndex.js

@@ -208,7 +208,7 @@ var bootstrap = function ($, learun) {
                     { label: "学号", name: "ProvinceCode", width: 100, align: "left" },
                     { label: "姓名", name: "StuName", width: 100, align: "left" },
                     {
-                        label: "性别", name: "GenderNo", width: 80, align: "left",
+                        label: "性别", name: "Gender", width: 80, align: "left",
                         formatter: function (cellvalue) {
                             return cellvalue == true ? "男" : "女";
                         }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/ReturnIndex.cshtml

@@ -88,7 +88,7 @@
                 </div>
                 <div class="col-xs-12 lr-form-item">
                     <div class="lr-form-item-title">异动原因</div>
-                    <textarea id="Remark" class="form-control" style="height: 100px;"></textarea>
+                    <textarea id="ChangeReason" class="form-control" style="height: 100px;"></textarea>
                 </div>
             </div>
 

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RolloffIndex.cshtml

@@ -80,7 +80,7 @@
                 </div>
                 <div class="col-xs-12 lr-form-item">
                     <div class="lr-form-item-title">异动原因</div>
-                    <textarea id="Remark" class="form-control" style="height: 100px;"></textarea>
+                    <textarea id="ChangeReason" class="form-control" style="height: 100px;"></textarea>
                 </div>
             </div>
             <div id="subbtn" style="margin:0 auto;cursor:pointer;margin-bottom:10px; position:relative; width:80px; height:28px;line-height:28px;border-radius:4px; background:#039cfd;color:#FFF;text-align:center;">

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

@@ -261,6 +261,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("RESIDENCEPLACE")]
         public string ResidencePlace { get; set; }
         /// <summary>
+        /// 档案所在地
+        /// </summary>
+        /// <returns></returns>
+        [Column("LOCATIONFILE")]
+        public string LocationFile { get; set; }
+        /// <summary>
         /// 籍贯
         /// </summary>
         [Column("REGIONNO")]
@@ -330,6 +336,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <returns></returns>
         [Column("STUTRANID")]
         public string StuTranId { get; set; }
+        /// <summary>
+        /// 复学时关联休学主键
+        /// </summary>
+        /// <returns></returns>
+        [Column("RETURNSCHOOLID")]
+        public string ReturnSchoolId { get; set; }
         #endregion
 
         #region 扩展操作

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

@@ -269,7 +269,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     InsertEntity.SuspensionBeginTime = entity.SuspensionBeginTime;
                     InsertEntity.SuspensionEndTime = entity.SuspensionEndTime;
                     InsertEntity.SuspensionPeriod = entity.SuspensionPeriod;
-                    InsertEntity.ChangeReason = entity.Remark;
+                    InsertEntity.Remark = entity.Remark;
                     //
                     InsertEntity.StuStatus = entity.StuStatus;
                     InsertEntity.F_WriteMark = entity.F_WriteMark;
@@ -345,6 +345,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     var InsertEntity = new StuTransferInfoEntity();
                     //历史数据
                     InsertEntity.StuId = item.StuId;
+                    InsertEntity.ReturnSchoolId = item.ID;
                     InsertEntity.StuNo = item.StuNo;
                     InsertEntity.StuName = item.StuName;
                     InsertEntity.Gender = item.Gender;
@@ -358,7 +359,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     InsertEntity.AnomalousType = entity.AnomalousType;
                     InsertEntity.ChangeReason = entity.ChangeReason;
                     InsertEntity.NewClassNo = entity.NewClassNo;
-                    InsertEntity.MajorNo = entity.MajorNo;
+                    InsertEntity.NewMajorNo = entity.NewMajorNo;
                     InsertEntity.NewDeptNo = entity.NewDeptNo;
                     InsertEntity.NewGrade = entity.NewGrade;
                     InsertEntity.LeaveDate = entity.LeaveDate;
@@ -409,21 +410,20 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             var db1 = this.BaseRepository().BeginTrans();
             try
             {
-                List<StuTransferInfoEntity> UpStuTran = new List<StuTransferInfoEntity>();
                 List<StuInfoBasicTranEntity> InStuinTran = new List<StuInfoBasicTranEntity>();
-                List<StuInfoBasicEntity> Stulist = new List<StuInfoBasicEntity>();
-                List<StuInfoBasicEntity> upStulist = new List<StuInfoBasicEntity>();
+                //List<StuInfoBasicEntity> Stulist = new List<StuInfoBasicEntity>();
+
                 var StuEntity = new StuInfoBasicEntity();
                 var Id = keyValue.Split(',');
                 foreach (var item in Id)
                 {
                     var addTruan = new StuInfoBasicEntity();
-                    var upTrua = this.BaseRepository("CollegeMIS").FindEntity<StuTransferInfoEntity>(x => x.ID == item);
+                    var upTrua = db.FindEntity<StuTransferInfoEntity>(x => x.ID == item);
                     upTrua.CheckUserId = userInfo.userId;
                     upTrua.CheckTime = DateTime.Now;
                     upTrua.F_EnabledMark = 1;
 
-                    var stulist = this.BaseRepository("CollegeMIS").FindEntity<StuInfoBasicEntity>(x => x.StuId == upTrua.StuId);
+                    var stulist = db.FindEntity<StuInfoBasicEntity>(x => x.StuId == upTrua.StuId);
                     var InsertStuTran = new StuInfoBasicTranEntity();
                     switch (upTrua.AnomalousType)
                     {
@@ -606,20 +606,19 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                             {
                                 #region 学籍操作
 
-                                StuEntity = new StuInfoBasicEntity
-                                {
-                                    //修改学籍表信息
-                                    StuId = upTrua.StuId,
-                                    StuNo = upTrua.StuNo,
-                                    StuName = upTrua.StuName,
-                                    ClassNo = upTrua.NewClassNo,
-                                    MajorNo = upTrua.NewMajorNo,
-                                    DeptNo = upTrua.NewDeptNo,
-                                    Grade = upTrua.NewGrade,
-                                    EduSystem = upTrua.EduSystem
-                                };
+                                //StuEntity = new StuInfoBasicEntity
+                                //{
+
+                                //修改学籍表信息
+
+                                stulist.ClassNo = upTrua.NewClassNo;
+                                stulist.MajorNo = upTrua.NewMajorNo;
+                                stulist.DeptNo = upTrua.NewDeptNo;
+                                stulist.Grade = upTrua.NewGrade;
+                                stulist.EduSystem = upTrua.EduSystem;
 
-                                upStulist.Add(StuEntity);
+                                //};
+                                db.Update(stulist);
                                 #endregion
 
                                 #region 课表（StuSelectLessonList，旧-写入新班级课表数据；）
@@ -633,6 +632,17 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                             }
                             else if (upTrua.AnomalousType == "02" || upTrua.AnomalousType == "05" || upTrua.AnomalousType == "06")
                             {
+                                if (upTrua.AnomalousType == "06") //休学保存部分基础数据 StuTransferInfo数据?
+                                {
+                                    upTrua.NationalityNo = stulist.NationalityNo;
+                                    upTrua.Province = stulist.F_ProvinceId;
+                                    upTrua.City = stulist.F_CityId;
+                                    upTrua.County = stulist.F_CountyId;
+                                    upTrua.Mobile = stulist.mobile;
+                                    upTrua.Remark = stulist.Remark;
+                                    upTrua.ResidencePlace = stulist.FatherUnit;
+                                    upTrua.LocationFile = stulist.MatherUnit;
+                                }
                                 #region 学籍操作
                                 if (upTrua.StuStatus == 0) //如果保留学籍，basic不动；否则删除学籍basic,备份到basictran；
                                 {
@@ -656,12 +666,20 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                             if (upTrua.IsReturnSchool == "0")
                             {
                                 upTrua.IsReturnSchool = "1";
+                                //修改记录为已审核
+                                upTrua.F_EnabledMark = 1;
+                                upTrua.CheckTime = DateTime.Now;
+                                upTrua.CheckUserId = userInfo.userId;
+
+                                //修改关联休学记录的 IsReturnSchool = 1 
+                                db.ExecuteBySql(" update StuTransferInfo set IsReturnSchool = 1 where  ID = '" + upTrua.ReturnSchoolId + "'");
+
                                 //1.basic找，有就改；2.basictran复制并改；
                                 if (stulist == null)
                                 {
                                     #region 重新生成学籍
                                     //复学的学籍
-                                    var ReturnStu = this.BaseRepository("CollegeMIS").FindEntity<StuInfoBasicTranEntity>(x => x.StuId == upTrua.StuId);
+                                    var ReturnStu = db.FindEntity<StuInfoBasicTranEntity>(x => x.StuId == upTrua.StuId);
 
                                     addTruan.StuId = ReturnStu.StuId;
                                     addTruan.StuNo = ReturnStu.StuNo;
@@ -836,7 +854,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                                     addTruan.DiplomaReceiveIdcard = ReturnStu.DiplomaReceiveIdcard;
                                     addTruan.DiplomaReceiveRemark = ReturnStu.DiplomaReceiveRemark;
                                     addTruan.CheckMark = "0";
-                                    Stulist.Add(addTruan);
+                                    db.Insert(addTruan);
                                     #endregion
 
                                 }
@@ -875,11 +893,13 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                             var stuInfoBasicEntity = new StuInfoBasicEntity();
                             stuInfoBasicEntity.StuId = upTrua.StuId;
                             stuInfoBasicEntity.StuNo = upTrua.StuNo;
+                            stuInfoBasicEntity.ProvinceCode = upTrua.StuNo;
                             stuInfoBasicEntity.StuName = upTrua.StuName;
-                            stuInfoBasicEntity.DeptNo = upTrua.DeptNo;
-                            stuInfoBasicEntity.MajorNo = upTrua.MajorNo;
-                            stuInfoBasicEntity.Grade = upTrua.Grade;
-                            stuInfoBasicEntity.ClassNo = upTrua.ClassNo;
+                            stuInfoBasicEntity.DeptNo = upTrua.NewDeptNo;
+                            stuInfoBasicEntity.MajorNo = upTrua.NewMajorNo;
+                            stuInfoBasicEntity.Grade = upTrua.NewGrade;
+                            stuInfoBasicEntity.ClassNo = upTrua.NewClassNo;
+                            stuInfoBasicEntity.EduSystem = upTrua.NewEduSystem;
                             stuInfoBasicEntity.GenderNo = upTrua.Gender;
                             stuInfoBasicEntity.Birthday = upTrua.Birthday;
                             stuInfoBasicEntity.NationalityNo = upTrua.NationalityNo;
@@ -907,13 +927,10 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                         default:
                             break;
                     }
-
-                    UpStuTran.Add(upTrua);
+                    db.Update(upTrua); //休学学籍异动信息
                 }
                 db.Insert(InStuinTran); //学籍异动记录
-                db.Update(UpStuTran); //修改学籍异动信息
-                db.Insert(Stulist); //学籍
-                db.Update(upStulist); //修改学籍
+                //db.Insert(Stulist); //学籍
 
                 db.Commit();
                 db1.Commit();