Browse Source

员工注册 1.1

leiy 1 year ago
parent
commit
1ac6654466

+ 6 - 6
OASystem/OASystem.Domain/Dtos/UserDto/RegisterDto.cs

@@ -63,14 +63,9 @@ namespace OASystem.Domain.Dtos.UserDto
         /// </summary>
         public string? IdCrad { get; set; }
 
-        /// <summary>
-        /// 出生日期
-        /// </summary>
-        public DateTime BirthDay { get; set; }
-
         /// <summary>
         /// 学历
-        /// 0 未设置 1 大专 2 本科 3 研究生
+        /// 0 未设置 1 小学、2 初中、3 高中、4 专科、5 本科、6 研究生
         /// </summary>
         public int Education { get; set; }
 
@@ -121,5 +116,10 @@ namespace OASystem.Domain.Dtos.UserDto
         /// 工作经历
         /// </summary>
         public string? WorkExperience { get; set; }
+
+        /// <summary>
+        /// 入职时间
+        /// </summary>
+        public DateTime Edate  { get; set; }
     }
 }

+ 1 - 1
OASystem/OASystem.Domain/Entities/System/Sys_Users.cs

@@ -42,7 +42,7 @@ namespace OASystem.Domain.Entities.System
         /// 密码
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
-        public string Password { get; set; }
+        public string Password { get; set; } = "123456"; //默认密码
         /// <summary>
         /// 性别0 男1 女  2 未设置
         /// </summary>

+ 5 - 1
OASystem/OASystem.Infrastructure/Repositories/Login/LoginRepository.cs

@@ -97,6 +97,10 @@ namespace OASystem.Infrastructure.Repositories.Login
         public async Task<Result> Register(LoginRepository _loginRep, RegisterDto registerDto)
         {
             Result result = new Result();
+
+            string IdCrad = registerDto.IdCrad;
+            string birthDay = IdCrad.Substring(6, 4) + "-" + IdCrad.Substring(10, 2) + "-" + IdCrad.Substring(12, 2);
+
             Sys_Users _userInfo = new Sys_Users()
             {
                 CnName = registerDto.CnName,
@@ -114,7 +118,7 @@ namespace OASystem.Infrastructure.Repositories.Login
                 Edate = DateTime.Now,  //入职时间默认当前数据提交时间
                 Rdate = new DateTime(1990, 1, 1),  //离职时间默认最原始时间
                 Seniority = 0, //工龄默认 0
-                Birthday = registerDto.BirthDay,
+                Birthday = Convert.ToDateTime(birthDay),
                 IDCard = registerDto.IdCrad,
                 StartWorkDate = new DateTime(1990, 1, 1),  //开始工作时间默认最原始时间
                 GraduateInstitutions = registerDto.GraduationSchhol,