From 1119d9160f2d9a2a4faa0b1a88d006e4595eab93 Mon Sep 17 00:00:00 2001 From: ndbs Date: Thu, 23 Mar 2023 17:57:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E7=B1=8D=E5=BC=82=E5=8A=A8=20?= =?UTF-8?q?=E4=BC=91=E5=AD=A6=E5=A4=8D=E5=AD=A6=E6=95=B0=E6=8D=AE=E6=9C=AA?= =?UTF-8?q?=E5=81=9A=E5=85=B3=E8=81=94=20=E5=AD=A6=E7=B1=8D=E5=BC=82?= =?UTF-8?q?=E5=8A=A8=E8=BD=AC=E5=85=A5=E5=AD=A6=E7=B1=8D=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E5=A4=B1=E8=B4=A5=20=E7=AD=89js=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/StuTransferInfo/DropOutIndex.cshtml | 2 +- .../Views/StuTransferInfo/Index.js | 2 +- .../Views/StuTransferInfo/MajorIndex.cshtml | 2 +- .../StuTransferInfo/RestAgainIndex.cshtml | 8 +- .../Views/StuTransferInfo/RestAgainIndex.js | 2 +- .../Views/StuTransferInfo/ReturnIndex.cshtml | 2 +- .../Views/StuTransferInfo/RolloffIndex.cshtml | 2 +- .../StuTransferInfo/StuTransferInfoEntity.cs | 12 +++ .../StuTransferInfo/StuTransferInfoService.cs | 79 +++++++++++-------- 9 files changed, 70 insertions(+), 41 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/DropOutIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/DropOutIndex.cshtml index 32f26563d..7933f349a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/DropOutIndex.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/DropOutIndex.cshtml @@ -80,7 +80,7 @@
异动原因
- +
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/Index.js index a4d618140..855c8733e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/Index.js +++ b/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 ? "男" : "女"; } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/MajorIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/MajorIndex.cshtml index a47cfa568..f5cc08d1b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/MajorIndex.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/MajorIndex.cshtml @@ -112,7 +112,7 @@
*@
异动原因
- +
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RestAgainIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RestAgainIndex.cshtml index 696d14865..be00b86f0 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RestAgainIndex.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RestAgainIndex.cshtml @@ -133,19 +133,19 @@
休学年限*
-
+
休学时段*
-
-
至*
+
+
至*
异动原因
- +
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RestAgainIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RestAgainIndex.js index cfb8642af..ad9773c28 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RestAgainIndex.js +++ b/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 ? "男" : "女"; } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/ReturnIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/ReturnIndex.cshtml index 87caeb4c8..12caf1fa2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/ReturnIndex.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/ReturnIndex.cshtml @@ -88,7 +88,7 @@
异动原因
- +
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RolloffIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RolloffIndex.cshtml index 68c75ba61..041aaa708 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RolloffIndex.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RolloffIndex.cshtml @@ -80,7 +80,7 @@
异动原因
- +
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 76cd37659..2893ac8e7 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 @@ -261,6 +261,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration [Column("RESIDENCEPLACE")] public string ResidencePlace { get; set; } /// + /// 档案所在地 + /// + /// + [Column("LOCATIONFILE")] + public string LocationFile { get; set; } + /// /// 籍贯 /// [Column("REGIONNO")] @@ -330,6 +336,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// [Column("STUTRANID")] public string StuTranId { get; set; } + /// + /// 复学时关联休学主键 + /// + /// + [Column("RETURNSCHOOLID")] + public string ReturnSchoolId { get; set; } #endregion #region 扩展操作 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 97ea8280c..410bff33b 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 @@ -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 UpStuTran = new List(); List InStuinTran = new List(); - List Stulist = new List(); - List upStulist = new List(); + //List Stulist = new List(); + var StuEntity = new StuInfoBasicEntity(); var Id = keyValue.Split(','); foreach (var item in Id) { var addTruan = new StuInfoBasicEntity(); - var upTrua = this.BaseRepository("CollegeMIS").FindEntity(x => x.ID == item); + var upTrua = db.FindEntity(x => x.ID == item); upTrua.CheckUserId = userInfo.userId; upTrua.CheckTime = DateTime.Now; upTrua.F_EnabledMark = 1; - var stulist = this.BaseRepository("CollegeMIS").FindEntity(x => x.StuId == upTrua.StuId); + var stulist = db.FindEntity(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(x => x.StuId == upTrua.StuId); + var ReturnStu = db.FindEntity(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();