diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryBasicInfo.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryBasicInfo.cshtml index 10657aad9..7d0916069 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryBasicInfo.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryBasicInfo.cshtml @@ -1,8 +1,8 @@ @{ ViewBag.Title = "综合查询-基本信息"; - Layout = "~/Views/Shared/_Form.cshtml"; + Layout = "~/Views/Shared/_Index.cshtml"; } - +@Html.AppendCssFile("/Views/UserCenter/user.css")
-
-
todo
+
+
+ +
+ @*
基本信息
*@ + +
+ +
+
+
+ @**@ + +
+
{{studentInfo.StuName}}
+
+
    +
  • 性       别 : {{studentInfo.GenderNo | sex}}
  • +
  • 出生日期 : {{studentInfo.Birthday | date}}
  • +
  • 校       区 : {{studentInfo.F_SchoolId | company}}
  • +
+
+
+ + +
+
+
基本信息
+
    +
  • 民 族 : {{studentInfo.NationalityNo |nationalityNo}}
  • +
  • 政治面貌 : {{studentInfo.PartyFaceNo | partyFaceNo}}
  • +
  • 身份证号 : {{studentInfo.IdentityCardNo}}
  • +
  • 户口所在地 : {{studentInfo.FatherUnit}}
  • +
+
+ +
+
家庭情况
+
    +
  • 监护人姓名 : {{studentInfo.Guardian}}
  • +
  • 监护人联系电话 : {{studentInfo.GuardianPhone}}
  • +
  • 与监护人关系 : {{studentInfo.GuardianType |guardiantype}}
  • +
  • 邮政编码 : {{studentInfo.PostalCode}}
  • +
  • 家庭地址 : {{studentInfo.MailAddress}}
  • +
+
+ +
+
学籍信息
+
    +
  • 学   籍   号 : {{studentInfo.StuCode}}
  • +
  • 学 号 : {{studentInfo.StuNo}}
  • +
  • 年       级 : {{studentInfo.Grade}}
  • +
  • 系 部 : {{studentInfo.DeptNo | deptNo}}
  • +
  • 专 业 : {{studentInfo.MajorNo | majorNo}}
  • +
  • 班 级 : {{studentInfo.ClassNo | class}}
  • +
  • 入团时间 : {{studentInfo.JoinLeagueDate | date}}
  • +
  • 现有学历 : {{studentInfo.GraduateNo | graduateNo}}
  • +
  • 报到日期 : {{studentInfo.RegisterDate | date}}
  • +
  • 入学年月 : {{studentInfo.EntranceDate | date}}
  • +
+
+ +
+
联系方式
+
    +
  • 联系电话 : {{studentInfo.mobile}}
  • +
  • QQ : {{studentInfo.QQ}}
  • +
  • E-mail : {{studentInfo.EMail}}
  • +
+
+
+ +
+ + +
+ +
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/UserCenterController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/UserCenterController.cs index 2356688f9..9050b625d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/UserCenterController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/UserCenterController.cs @@ -25,6 +25,8 @@ namespace Learun.Application.Web.Controllers private StuInfoBasicIBLL stuInfoBasicIBLL = new StuInfoBasicBLL(); private EmpInfoIBLL empInfoIBLL = new EmpInfoBLL(); private AnnexesFileIBLL annesexFileIBll = new AnnexesFileBLL(); + private StuTransferInfoIBLL stuTransferInfoIBLL = new StuTransferInfoBLL(); + private StuInfoBasicTranIBLL stuInfoBasicTranIBLL = new StuInfoBasicTranBLL(); #region 视图功能 @@ -224,7 +226,7 @@ namespace Learun.Application.Web.Controllers } else { - photo = Config.GetValue("fileHeadImg") +"/"+ (result.GenderNo==true? "on-boy.jpg" : "on-girl.jpg"); + photo = Config.GetValue("fileHeadImg") + "/" + (result.GenderNo == true ? "on-boy.jpg" : "on-girl.jpg"); photo = "/" + photo.Substring(photo.IndexOf("Content")); } result.Photo = photo; @@ -254,6 +256,34 @@ namespace Learun.Application.Web.Controllers } return Success(new { basecInfo = baseInfo, userInfo = result, imgUrl = url }); } + /// + /// 查看学生异动前的学生信息 + /// + /// StuTransferInfo 学籍异动表主键 + /// + public ActionResult GetStudentInfoOfTran(string keyValue) + { + var result = new StuInfoBasicTranEntity(); + var StuTransferInfoEntity = stuTransferInfoIBLL.GetEntity(keyValue); + var StuInfoBasicTranEntity = stuInfoBasicTranIBLL.GetEntity(StuTransferInfoEntity?.StuTranId); + if (StuInfoBasicTranEntity != null) + { + var photo = annesexFileIBll.GetEntityByFolderId(StuInfoBasicTranEntity.Photo)?.F_FilePath; + if (photo != null) + { + photo = "/" + photo.Substring(photo.IndexOf("Resource")); + } + else + { + photo = Config.GetValue("fileHeadImg") + "/" + (StuInfoBasicTranEntity.GenderNo == true ? "on-boy.jpg" : "on-girl.jpg"); + photo = "/" + photo.Substring(photo.IndexOf("Content")); + } + StuInfoBasicTranEntity.Photo = photo; + result = StuInfoBasicTranEntity; + } + return Success(new { userInfo = result }); + + } #endregion #region 提交数据 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/StuInfoBasicTranMap.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/StuInfoBasicTranMap.cs index 70860e716..5bd94ac45 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/StuInfoBasicTranMap.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/StuInfoBasicTranMap.cs @@ -18,7 +18,7 @@ namespace Learun.Application.Mapping //表 this.ToTable("STUINFOBASICTRAN"); //主键 - this.HasKey(t => t.StuId); + this.HasKey(t => t.ID); #endregion #region 配置关系 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicTran/StuInfoBasicTranEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicTran/StuInfoBasicTranEntity.cs index bf71215a4..3a19c9316 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicTran/StuInfoBasicTranEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicTran/StuInfoBasicTranEntity.cs @@ -15,11 +15,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration { #region 实体成员 /// - /// Id + /// ID /// /// [Column("ID")] - public string Id { get; set; } + public string ID { get; set; } /// /// StuId /// @@ -1081,7 +1081,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// public void Create() { - this.Id = Guid.NewGuid().ToString(); + this.ID = Guid.NewGuid().ToString(); } /// /// 编辑调用 @@ -1089,7 +1089,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// public void Modify(string keyValue) { - this.Id = keyValue; + this.ID = keyValue; } #endregion } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicTran/StuInfoBasicTranService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicTran/StuInfoBasicTranService.cs index 5fb403f88..08294f27f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicTran/StuInfoBasicTranService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicTran/StuInfoBasicTranService.cs @@ -117,7 +117,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration { try { - this.BaseRepository("CollegeMIS").Delete(t=>t.Id == keyValue); + this.BaseRepository("CollegeMIS").Delete(t=>t.ID == keyValue); } catch (Exception ex) { 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 4b6e4f234..6f12307ee 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,7 +437,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration #region 复制一份学生学籍表 copyStuInfoBasic(upTrua, stulist, InsertStuTran); - upTrua.StuTranId = InsertStuTran.Id; + upTrua.StuTranId = InsertStuTran.ID; InStuinTran.Add(InsertStuTran); #endregion