学籍异动 休学复学

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuTransferInfoController.cs

@@ -204,7 +204,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         [HttpPost]
         [ValidateAntiForgeryToken]
         [AjaxOnly]
-        public ActionResult SaveAgainEntity(string keyValue, StuTransferInfoEntity entity, string strStuTranEntity)
+        public ActionResult SaveAgainEntity(StuTransferInfoEntity entity, string strStuTranEntity)
         {
             List<StuTransferInfoEntity> strStuTranList = strStuTranEntity.ToObject<List<StuTransferInfoEntity>>();
             stuTransferInfoIBLL.SaveAgainEntity(entity, strStuTranList);

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

@@ -20,7 +20,7 @@ var bootstrap = function ($, learun) {
                 var entity = $('body').lrGetFormData();
                 entity.AnomalousType = entity.NewAnomalousType;
                 var selgridtab = $('#selgridtab').jfGridGet('rowdatas');
-                $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/StuTransferInfo/SaveForm', { entity: entity, strStuEntity: JSON.stringify(selgridtab) },
+                $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/StuTransferInfo/SaveAgainEntity', { entity: entity, strStuTranEntity: JSON.stringify(selgridtab) },
                     function (res) {
                         //console.log(res)
                         if (res.code == 200) {

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

@@ -165,9 +165,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             }
         }
         /// <summary>
-        /// 休学
+        /// 复学
         /// </summary>
-        /// <param name="keyValue"></param>
         /// <param name="entity"></param>
         /// <param name="strStuList"></param>
         public void SaveAgainEntity(StuTransferInfoEntity entity, List<StuTransferInfoEntity> strStuList)

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

@@ -254,6 +254,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     InsertEntity.DeptNo = item.DeptNo;
                     InsertEntity.Grade = item.Grade;
                     InsertEntity.EduSystem = item.EduSystem;
+                    InsertEntity.IdentityCardNo = item.IdentityCardNo;
                     InsertEntity.EnteDate = entity.EnteDate; //前端还是后端处理
                     //新数据
                     InsertEntity.AnomalousType = entity.AnomalousType;
@@ -360,6 +361,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     InsertEntity.NewGrade = entity.NewGrade;
                     InsertEntity.LeaveDate = entity.LeaveDate;
                     InsertEntity.StuStatus = entity.StuStatus;
+                    InsertEntity.IdentityCardNo = item.IdentityCardNo;
                     //恢复学籍,恢复账号
                     InsertEntity.RecoverStuStatus = entity.RecoverStuStatus;
                     InsertEntity.RecoverWriteMark = entity.RecoverWriteMark;
@@ -432,7 +434,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                         case "06": //休学
                         case "08": //转专业
                             #region 复制一份学生学籍表
-
+                            InsertStuTran.StuId = stulist.StuId;
                             InsertStuTran.StuNo = stulist.StuNo;
                             InsertStuTran.StuCode = stulist.StuCode;
                             InsertStuTran.NoticeNo = stulist.NoticeNo;
@@ -609,6 +611,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                             InsertStuTran.AnomalousType = upTrua.AnomalousType;
                             InsertStuTran.ChangeReason = upTrua.ChangeReason;
                             InsertStuTran.TranDateTime = DateTime.Now;
+                            InsertStuTran.Create();
 
                             InStuinTran.Add(InsertStuTran);
                             #endregion
@@ -622,9 +625,9 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                                 StuEntity.StuNo = upTrua.StuNo;
                                 StuEntity.StuName = upTrua.StuName;
                                 StuEntity.ClassNo = upTrua.ClassNo;
-                                StuEntity.MajorNo = upTrua.MajorNo;
-                                StuEntity.DeptNo = upTrua.DeptNo;
-                                StuEntity.Grade = upTrua.Grade;
+                                StuEntity.MajorNo = upTrua.NewMajorNo;
+                                StuEntity.DeptNo = upTrua.NewDeptNo;
+                                StuEntity.Grade = upTrua.NewGrade;
                                 StuEntity.EduSystem = upTrua.EduSystem;
                                 upStulist.Add(StuEntity);
                             }
@@ -637,10 +640,10 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
 
                             #region 删除用户表
 
-                            //是注销学籍,删除学籍
-                            if (upTrua.F_WriteMark == 0)
+                            //是注销账号,账号禁用
+                            if (upTrua.F_WriteMark == 1)
                             {
-                                db1.ExecuteBySql(" update LR_Base_User set F_DeleteMark=1 where F_EnCode='" + upTrua.StuNo + "' and F_Account ='" + upTrua.StuNo + "'and F_RealName='" + upTrua.StuName + "' and F_IdentityCardNo ='" + upTrua.IdentityCardNo + "' ");
+                                db1.ExecuteBySql(" update LR_Base_User set F_EnabledMark=0 where F_EnCode='" + upTrua.StuNo + "' and F_Account ='" + upTrua.StuNo + "'and F_RealName='" + upTrua.StuName + "' and F_IdentityCardNo ='" + upTrua.IdentityCardNo + "' ");
                             }
                             #endregion
 
@@ -656,7 +659,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                                     var ReturnStu = this.BaseRepository("CollegeMIS").FindEntity<StuInfoBasicTranEntity>(x => x.StuId == upTrua.StuId);
 
                                     #region 重新生成学籍
-
+                                    addTruan.StuId = ReturnStu.StuId;
                                     addTruan.StuNo = ReturnStu.StuNo;
                                     addTruan.StuCode = ReturnStu.StuCode;
                                     addTruan.NoticeNo = ReturnStu.NoticeNo;
@@ -834,7 +837,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                                 }
                                 if (upTrua.RecoverWriteMark == "0") //恢复账号
                                 {
-                                    db1.ExecuteBySql(" update LR_Base_User set F_DeleteMark0 where F_EnCode='" + upTrua.StuNo + "' and F_Account ='" + upTrua.StuNo + "'and F_RealName='" + upTrua.StuName + "' and F_IdentityCardNo ='" + upTrua.IdentityCardNo + "' ");
+                                    db1.ExecuteBySql(" update LR_Base_User set F_EnabledMark= 1 where F_EnCode='" + upTrua.StuNo + "' and F_Account ='" + upTrua.StuNo + "'and F_RealName='" + upTrua.StuName + "' and F_IdentityCardNo ='" + upTrua.IdentityCardNo + "' ");
                                     UpStuTran.Add(upTrua); //修改学籍异动表 为复学
                                 }
                             }
@@ -866,7 +869,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                         default:
                             #region 复制一份学生学籍表
 
-                            InsertStuTran.StuNo = stulist.StuNo;
+                            InsertStuTran.StuId = stulist.StuId; InsertStuTran.StuNo = stulist.StuNo;
                             InsertStuTran.StuCode = stulist.StuCode;
                             InsertStuTran.NoticeNo = stulist.NoticeNo;
                             InsertStuTran.GraduateYear = stulist.GraduateYear;
@@ -1042,7 +1045,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                             InsertStuTran.AnomalousType = upTrua.AnomalousType;
                             InsertStuTran.ChangeReason = upTrua.ChangeReason;
                             InsertStuTran.TranDateTime = DateTime.Now;
-
+                            InsertStuTran.Create();
                             InStuinTran.Add(InsertStuTran);
                             #endregion
 
@@ -1072,10 +1075,10 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
 
                             #region 删除用户表
 
-                            //是注销学籍,删除学籍
-                            if (upTrua.F_WriteMark == 0)
+                            //是注销账号,账号禁用
+                            if (upTrua.F_WriteMark == 1)
                             {
-                                db1.ExecuteBySql(" update LR_Base_User set F_DeleteMark=1 where F_EnCode='" + upTrua.StuNo + "' and F_Account ='" + upTrua.StuNo + "'and F_RealName='" + upTrua.StuName + "' and F_IdentityCardNo ='" + upTrua.IdentityCardNo + "' ");
+                                db1.ExecuteBySql(" update LR_Base_User set F_EnabledMark=0 where F_EnCode='" + upTrua.StuNo + "' and F_Account ='" + upTrua.StuNo + "'and F_RealName='" + upTrua.StuName + "' and F_IdentityCardNo ='" + upTrua.IdentityCardNo + "' ");
                             }
                             #endregion