From 7f59ab22e672dbd8bfaed05d0b3213c188f1c03d Mon Sep 17 00:00:00 2001
From: zzj <31836194@qq.com>
Date: Mon, 11 Dec 2023 09:59:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E8=BF=81=E7=A7=BB=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E7=9A=84=E5=AE=9E=E4=BD=93=E6=A8=A1=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EmpInfo/EmpInfoEntity.cs                  | 108 ++++++++++++++----
 1 file changed, 86 insertions(+), 22 deletions(-)

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