2023-3-20 09:53:05

OASystem/PaymentSystem.Api/OAMethodLib/BaseConfig.cs

@@ -1,4 +1,4 @@
-namespace OASystem.API.CMBPayBusiness
+namespace OASystem.API.OAMethodLib
 {
     public static class BaseConfig
     {

OASystem/PaymentSystem.Api/OAMethodLib/Common.cs

@@ -1,4 +1,4 @@
-namespace OASystem.API.CMBPayBusiness
+namespace OASystem.API.OAMethodLib
 {
     public static class Common
     {

OASystem/PaymentSystem.Api/OAMethodLib/sm3withsm2.cs

@@ -1,4 +1,4 @@
-namespace OASystem.API.CMBPayBusiness
+namespace OASystem.API.OAMethodLib
 {
     /**
      * need lib:

OASystem/PaymentSystem.Domain/AutoMappers/_baseMappingProfile.cs

@@ -11,7 +11,7 @@ namespace OASystem.Domain.AutoMappers
         {
             //CreateMap<OrderDto, Order>();
             #region Login
-            CreateMap<LoginDto, S_Users>();
+            CreateMap<LoginDto, Sys_Users>();
             #endregion
 
         }

OASystem/PaymentSystem.Domain/Entities/BasicInfo/S_Users.cs

@@ -1,203 +1,159 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace OASystem.Domain.Entities.BasicInfo
+using OASystem.Domain.Entities;
+using SqlSugar;
+namespace OaSystem.Domain.Entities.System
 {
     /// <summary>
-    /// 员工信息表
+    /// 用户表
     /// </summary>
-    [SugarTable("S_Users")]
-    public class S_Users :EntityBase
+    [SugarTable("Sys_Users")]
+    public class Sys_Users : EntityBase
     {
         /// <summary>
-        /// 中文名称
+        /// 中文姓名
         /// </summary>
-        [SugarColumn(IsNullable = true)]
+        [SugarColumn(IsNullable = false, Length = 50)]
         public string CnName { get; set; }
-
         /// <summary>
-        /// 英文名称
+        /// 英文姓名
         /// </summary>
-        [SugarColumn(IsNullable = true)]
+        [SugarColumn(IsNullable = false, Length = 50)]
         public string EnName { get; set; }
-
         /// <summary>
-        /// 员工工号
+        /// 工号
         /// </summary>
-        [SugarColumn(IsNullable = true)]
+        [SugarColumn(IsNullable = false, Length = 50)]
         public string Number { get; set; }
-
         /// <summary>
         /// 公司Id
         /// </summary>
-        [SugarColumn(IsNullable = true)]
+        [SugarColumn(IsNullable = false)]
         public int CompanyId { get; set; }
-
         /// <summary>
         /// 部门Id
         /// </summary>
-        [SugarColumn(IsNullable = true)]
+        [SugarColumn(IsNullable = false)]
         public int DepId { get; set; }
-
         /// <summary>
         /// 岗位Id
         /// </summary>
-        [SugarColumn(IsNullable = true)]
+        [SugarColumn(IsNullable = false)]
         public int JobPostId { get; set; }
-
         /// <summary>
         /// 密码
         /// </summary>
-        [SugarColumn(IsNullable = true)]
+        [SugarColumn(IsNullable = false, Length = 50)]
         public string Password { get; set; }
-
         /// <summary>
-        /// 性别
-        /// 0 男 1 女  2 未设置
+        /// 性别0 男1 女  2 未设置
         /// </summary>
-        [SugarColumn(IsNullable = true)]
+        [SugarColumn(IsNullable = false)]
         public int Sex { get; set; }
-
         /// <summary>
         /// 分机号
         /// </summary>
-        [SugarColumn(IsNullable = true)]
+        [SugarColumn(IsNullable = false, Length = 50)]
         public string Ext { get; set; }
-
         /// <summary>
-        /// 分机号
+        /// 手机号
         /// </summary>
-        [SugarColumn(IsNullable = true)]
+        [SugarColumn(IsNullable = false, Length = 50)]
         public string Phone { get; set; }
-
         /// <summary>
-        /// 紧急联系人
+        /// 紧急联系人 手机号
         /// </summary>
-        [SugarColumn(IsNullable = true)]
+        [SugarColumn(IsNullable = false, Length = 50)]
         public string UrgentPhone { get; set; }
-
         /// <summary>
         /// 邮箱
         /// </summary>
-        [SugarColumn(IsNullable = true)]
+        [SugarColumn(IsNullable = false, Length = 50)]
         public string Email { get; set; }
-
         /// <summary>
-        /// 现居地址
+        /// 住址
         /// </summary>
-        [SugarColumn(IsNullable = true)]
+        [SugarColumn(IsNullable = false, Length = 200)]
         public string Address { get; set; }
-
         /// <summary>
         /// 入职时间
         /// </summary>
-        [SugarColumn(IsNullable = true)]
+        [SugarColumn(IsNullable = false)]
         public DateTime Edate { get; set; }
-
         /// <summary>
         /// 离职时间
         /// </summary>
-        [SugarColumn(IsNullable = true)]
+        [SugarColumn(IsNullable = false)]
         public DateTime Rdate { get; set; }
-
         /// <summary>
         /// 工龄
         /// </summary>
-        [SugarColumn(IsNullable = true)]
+        [SugarColumn(IsNullable = false)]
         public int Seniority { get; set; }
-
-        /// <summary>
-        /// 备注
-        /// </summary>
-        [SugarColumn(IsNullable = true)]
-        public string Remark { get; set; }
-
-        /// <summary>
-        /// 是否删除
-        /// </summary>
-        [SugarColumn(IsNullable = true)]
-        public int IsDel { get; set; }
-
         /// <summary>
         /// 生日
         /// </summary>
-        [SugarColumn(IsNullable = true)]
+        [SugarColumn(IsNullable = false)]
         public DateTime Birthday { get; set; }
-
         /// <summary>
-        /// 身份证
+        /// 身份证号码
         /// </summary>
-        [SugarColumn(IsNullable = true)]
+        [SugarColumn(IsNullable = false, Length = 20)]
         public string IDCard { get; set; }
-
         /// <summary>
-        /// 开始工作日期
+        /// 开始工作时
         /// </summary>
-        [SugarColumn(IsNullable = true)]
+        [SugarColumn(IsNullable = false)]
         public DateTime StartWorkDate { get; set; }
-
         /// <summary>
         /// 毕业学校
         /// </summary>
-        [SugarColumn(IsNullable = true)]
+        [SugarColumn(IsNullable = false, Length = 200)]
         public string GraduateInstitutions { get; set; }
-
         /// <summary>
         /// 专业
         /// </summary>
-        [SugarColumn(IsNullable = true)]
+        [SugarColumn(IsNullable = false, Length = 50)]
         public string Professional { get; set; }
-
         /// <summary>
-        /// 学历
+        /// 专业
         /// </summary>
-        [SugarColumn(IsNullable = true)]
-        public string Education { get; set; }
-
+        [SugarColumn(IsNullable = false)]
+        public int Education { get; set; }
         /// <summary>
         /// 学历类型
         /// </summary>
-        [SugarColumn(IsNullable = true)]
-        public string TheOrAdultEducation { get; set; }
-
+        [SugarColumn(IsNullable = false)]
+        public int TheOrAdultEducation { get; set; }
         /// <summary>
         /// 婚姻状态
         /// </summary>
-        [SugarColumn(IsNullable = true)]
+        [SugarColumn(IsNullable = false, Length = 200)]
         public string MaritalStatus { get; set; }
-
         /// <summary>
         /// 家庭地址
         /// </summary>
-        [SugarColumn(IsNullable = true)]
+        [SugarColumn(IsNullable = false, Length = 200)]
         public string HomeAddress { get; set; }
-
         /// <summary>
         /// 试用期
         /// </summary>
-        [SugarColumn(IsNullable = true)]
+        [SugarColumn(IsNullable = false, Length = 200)]
         public string UsePeriod { get; set; }
-
         /// <summary>
         /// 工作经历
         /// </summary>
-        [SugarColumn(IsNullable = true)]
+        [SugarColumn(IsNullable = false, Length = 500)]
         public string WorkExperience { get; set; }
-
         /// <summary>
         /// 证书上传
         /// </summary>
-        [SugarColumn(IsNullable = true)]
+        [SugarColumn(IsNullable = false, Length = 500)]
         public string Certificate { get; set; }
-
         /// <summary>
-        /// 人事审核 
-        /// 0未审核(初始状态) 1 已通过（可用）2已拒绝
+        /// 人事审核 0未审核(初始状态) 1 已通过（可用）2已拒绝
         /// </summary>
-        [SugarColumn(IsNullable = true)]
+        [SugarColumn(IsNullable = false)]
         public int HrAudit { get; set; }
+
+
     }
 }

OASystem/PaymentSystem.Infrastructure/Repositories/Login/LoginRepository.cs

@@ -4,7 +4,7 @@ using OASystem.Domain.Entities.BasicInfo;
 
 namespace OASystem.Infrastructure.Repositories.Login
 {
-    public class LoginRepository : BaseRepository<S_Users, LoginView>
+    public class LoginRepository : BaseRepository<Sys_Users, LoginView>
     {
         public LoginRepository(SqlSugarClient sqlSugar) : base(sqlSugar)
         {