From bf31651a78be57d42cef4557f5e875ef271229d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=99=93=E5=AF=92?= <823756726@qq.com> Date: Thu, 15 Aug 2024 14:07:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E5=AD=A6=E7=B1=8D=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=EF=BC=9A=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6=E5=9C=A8?= =?UTF-8?q?=E6=A0=A1=EF=BC=8C=E5=AD=A6=E7=B1=8D=E7=8A=B6=E6=80=81=EF=BC=8C?= =?UTF-8?q?=E5=AD=A6=E7=94=9F=E5=BD=93=E5=89=8D=E7=8A=B6=E6=80=81=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=20=E9=83=A8=E9=97=A8=E5=A2=9E=E5=8A=A0=E9=83=A8?= =?UTF-8?q?=E9=97=A8=E7=BC=96=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/StuInfoBasic/Index.js | 3 +++ .../Learun.Application.Web.csproj | 5 +---- .../EducationalAdministration/EmpInfo/EmpInfoEntity.cs | 4 ++++ .../EmpInfo/EmpInfoService.cs | 9 ++++++++- .../StuInfoBasic/StuInfoBasicEntity.cs | 10 ++++++++++ 5 files changed, 26 insertions(+), 5 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js index f754e2ac2..8f14230dc 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js @@ -240,6 +240,9 @@ var bootstrap = function ($, learun) { { label: "考生号", name: "ksh", width: 100, align: "left" }, { label: "通知书号", name: "NoticeNo", width: 100, align: "left" }, { label: "姓名", name: "StuName", width: 100, align: "left" }, + { label: "是否在校", name: "InSchoolStatus", width: 100, align: "left" }, + { label: "学籍状态", name: "XJZT", width: 100, align: "left" }, + { label: "学生当前状态", name: "XSDQZT", width: 100, align: "left" }, { label: "性别", name: "GenderNo", width: 80, align: "left", formatter: function (cellvalue) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj index 584fb2354..a135fe90f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj @@ -23,7 +23,7 @@ ..\..\..\ true - + false @@ -109,9 +109,6 @@ ..\packages\Unity.4.0.1\lib\net45\Microsoft.Practices.Unity.RegistrationByConvention.dll - - False - ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll True diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoEntity.cs index 9ef22d4ad..0d01a0b00 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoEntity.cs @@ -645,6 +645,10 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// [NotMapped] public string DepartmentName { get; set; } /// + /// 部门编号 + /// + [NotMapped] public string DepartmentNo { get; set; } + /// /// 工作简历 /// [NotMapped] public List PM_ResumeList { get; set; } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs index 0c6bf6530..23e61fcfd 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs @@ -187,7 +187,14 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration { try { - return this.BaseRepository("CollegeMIS").FindList(); + var dept = this.BaseRepository().FindList(); + var list= this.BaseRepository("CollegeMIS").FindList(); + foreach (var item in list) + { + item.DepartmentName = dept.FirstOrDefault(x=>x.F_DepartmentId==item.F_DepartmentId)?.F_FullName; + item.DepartmentNo = dept.FirstOrDefault(x => x.F_DepartmentId == item.F_DepartmentId)?.F_EnCode; ; + } + return list; } catch (Exception ex) { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs index 17b8d9dca..0c1bbe58d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs @@ -799,6 +799,16 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// [Column("MOVESTATUS")] public int? MoveStatus { get; set; } + /// + /// 学籍状态 + /// + [Column("XJZT")] + public string XJZT { get; set; } + /// + /// 学生当前状态 + /// + [Column("XSDQZT")] + public string XSDQZT { get; set; } #endregion