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 166ba0f76..c0f5a19aa 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 @@ -22,12 +22,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// [Column("EMPID")] public string EmpId { get; set; } - /// - /// 二维码状态 - /// - [Column("QRCODESTATUS")] - public int? QRCodeStatus { get; set; } - /// /// 职工号 /// @@ -43,6 +37,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// [Column("GENDERNO")] public bool? GenderNo { get; set; } + /// + /// 工资编号 + /// + [Column(name: "SALARYNUMBER")] + public string SalaryNumber { get; set; } + /// /// 出生日期 /// @@ -357,6 +357,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// [Column("JOINPARTYTIME")] public string JoinPartyTime { get; set; } + /// + /// 转为正式党员日期 + /// + [Column("OFFICIALPARTYTIME")] + public DateTime? OfficialPartyTime { get; set; } /// /// 岗位职级 @@ -586,23 +591,81 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration [Column("PROFESSIONALTITLEGETTIME")] public DateTime? ProfessionalTitleGetTime { get; set; } /// - /// 员工状态时间 + /// 用工类型 /// - [Column("ISINACTIVETIME")] - public DateTime? IsInActiveTime { get; set; } + [Column("EMPLOYTYPE")] + public string EmployType { get; set; } + /// + /// 档案号 + /// + [Column("FILENUMBER")] + public string FileNumber { get; set; } + /// + /// 婚姻状况 + /// + [Column("MARITAL")] + public string Marital { get; set; } + /// + /// 教师资格证种类 + /// + [Column("TEACHERQUALIFICATIONS")] + public string TeacherQualifications { get; set; } + /// + /// 教师资格证种类编号 + /// + [Column("TEACHERQUALIFICATIONSNO")] + public string TeacherQualificationsNo { get; set; } + /// + /// 其他教师资格种类 + /// + [Column("OTHERTEACHERQUALIFICATIONS")] + public string OtherTeacherQualifications { get; set; } + /// + /// 普通话等级 + /// + [Column("MANDARINLEVEL")] + public string MandarinLevel { get; set; } + /// + /// 资格证获取提交状态 + /// + [Column("CERTIFICATESTATUS")] + public bool? CertificateStatus { get; set; } + /// + /// 考核时间 + /// + [Column("ASSESSTIME")] + public DateTime? AssessTime { get; set; } + /// + /// 考核年度 + /// + [Column("ASSESSYEAR")] + public string AssessYear { get; set; } + /// + /// 考核结果 + /// + [Column("ASSESSRESULT")] + public string AssessResult { get; set; } + /// + /// 年度考核结果提交状态 + /// + [Column("YEARASSESSSTATUS")] + public bool? YearAssessStatus { get; set; } + /// + /// 聘任变更提交状态 + /// + [Column("POSITIONLEVELSTATUS")] + public bool? PositionLevelStatus { get; set; } /// /// 排序 /// [Column("F_ORDER")] public int? F_Order { get; set; } - /// - /// 认定出生年月日 + /// 员工状态时间 /// - [Column("BIRTHDAYCONFIRM")] - public DateTime? BirthdayConfirm { get; set; } - + [Column("ISINACTIVETIME")] + public DateTime? IsInActiveTime { get; set; } #endregion #region 扩展操作 @@ -673,14 +736,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// 处分情况 /// [NotMapped] public List TeacherPunishmentList { get; set; } - /// - /// 证书信息 - /// - [NotMapped] public string CertificateNames { get; set; } - /// - /// 获取证书日期 - /// - [NotMapped] public string CertificateDates { get; set; } + /// /// 60岁以上 /// @@ -701,6 +757,14 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// 20~30岁 /// [NotMapped] public int age5 { get; set; } + /// + /// 证书信息 + /// + [NotMapped] public string CertificateNames { get; set; } + /// + /// 获取证书日期 + /// + [NotMapped] public string CertificateDates { get; set; } #endregion } }