2023-3-20 14:52:30

OASystem/EntitySync/Program.cs

@@ -1,9 +1,10 @@
 using OASystem.Domain.Entities;
+using OASystem.Domain.Entities.System;
 using SqlSugar;
 
 var db = new SqlSugarClient(new ConnectionConfig()
 {
-    ConnectionString = "server=132.232.92.186;uid=sa;pwd=Yjx@158291;database=PaymentSystemDB;",
+    ConnectionString = "server=132.232.92.186;uid=sa;pwd=Yjx@158291;database=OA2023DB;",
     DbType = SqlSugar.DbType.SqlServer,
     IsAutoCloseConnection = true,
     InitKeyType = InitKeyType.Attribute
@@ -32,12 +33,12 @@ else
 }
 #endregion
 
-////同步数据表结构
-//db.DbMaintenance.CreateDatabase();
-//db.CodeFirst.SetStringDefaultLength(50).BackupTable().InitTables(new Type[]
-//{
-//   typeof(Order)//T_Order
-//   ,typeof(CMBPaymentDetail)
-//   ,typeof(CMBRefundReq)
-//});
-//Console.WriteLine("数据库结构同步完成!");
+//同步数据表结构
+db.DbMaintenance.CreateDatabase();
+db.CodeFirst.SetStringDefaultLength(50).BackupTable().InitTables(new Type[]
+{
+   typeof(Sys_PageFunctionPermission)
+   ,typeof(Sys_SystemMenuAndFunction)
+   ,typeof(Sys_SystemMenuPermission)
+});
+Console.WriteLine("数据库结构同步完成!");

OASystem/OASystem.Domain/CMBPayBusiness/Entity/CMBInfoBase.cs

@@ -1,22 +0,0 @@
-namespace OASystem.Domain.CMBPayBusiness.Entity
-{
-    public class CMBInfoBase
-    {
-        /// <summary>
-        /// 商户号
-        /// </summary>
-        public string merId { get; set; }
-
-        /// <summary>
-        /// 商户订单号
-        /// </summary>
-        public string orderId { get; set; }
-
-        /// <summary>
-        /// 招行平台订单号
-        /// </summary>
-        public string cmbOrderId { get; set; }
-    }
-
-    
-}

OASystem/OASystem.Domain/Entities/EntityBase.cs

@@ -8,33 +8,33 @@
         /// <summary>
         /// 编号
         /// </summary>
-        [SugarColumn(ColumnDescription = "主键", IsPrimaryKey = true, IsIdentity = true)]
+        [SugarColumn(ColumnDescription = "主键", IsPrimaryKey = true, /*IsIdentity = true,*/ IsNullable = false)]
         public int Id { get; set; }
         /// <summary>
         /// 创建者Id
         /// </summary>
-        [SugarColumn(ColumnDescription = "创建者Id", IsNullable = true)]
-        public string CreateUserId { get; set; }
+        [SugarColumn(ColumnDescription = "创建者Id", IsNullable = true,ColumnDataType ="int")]
+        public int CreateUserId { get; set; }
         /// <summary>
         /// 创建时间
         /// </summary>
-        [SugarColumn(ColumnDescription = "创建时间")]
+        [SugarColumn(ColumnDescription = "创建时间", IsNullable = true,ColumnDataType = "DateTime")]
         public DateTime CreateTime { get; set; } = DateTime.Now;
        
         /// <summary>
         /// 是否删除
         /// </summary>
-        [SugarColumn(ColumnDescription = "是否删除")]
+        [SugarColumn(ColumnDescription = "是否删除", IsNullable = true,ColumnDataType ="int")]
         public bool IsDel { get; set; }
         /// <summary>
         /// 删除者Id
         /// </summary>
-        [SugarColumn(ColumnDescription = "删除者Id")]
-        public string DeleteUserId { get; set; } = "Default";
+        [SugarColumn(ColumnDescription = "删除者Id", IsNullable = true, ColumnDataType = "int")]
+        public int DeleteUserId { get; set; }
         /// <summary>
         /// 删除时间
         /// </summary>
-        [SugarColumn(ColumnDescription = "删除时间")]
+        [SugarColumn(ColumnDescription = "删除时间",IsNullable = true,ColumnDataType = "DateTime")]
         public string DeleteTime { get; set; }
     }
 

OASystem/OASystem.Domain/Entities/System/Sys_Company.cs

@@ -9,33 +9,33 @@
         /// <summary>
         /// 公司Code
         /// </summary>
-        [SugarColumn(IsNullable =false,Length =50)]
+        [SugarColumn(IsNullable =true,ColumnDataType ="varchar(20)")]
         public string CompanyCode { get; set; }
         /// <summary>
         /// 公司名称
         /// </summary>
-        [SugarColumn(IsNullable = false, Length = 50)]
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
         public string CompanyName { get; set; }
        
         /// <summary>
         /// 公司所在地
         /// </summary>
-        [SugarColumn(IsNullable = false, Length = 200)]
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(200)")]
         public string Address { get; set; }
         /// <summary>
         /// 负责人Id
         /// </summary>
-        [SugarColumn(IsNullable =false)]
+        [SugarColumn(IsNullable =true, ColumnDataType = "int")]
         public int ContactUserId { get; set; }
         /// <summary>
         /// 联系方式
         /// </summary>
-        [SugarColumn(IsNullable =false,Length =30)]
+        [SugarColumn(IsNullable =true, ColumnDataType = "varchar(30)")]
         public string Tel { get; set; }
         /// <summary>
         /// 父级公司Id
         /// </summary>
-        [SugarColumn(IsNullable =false)]
+        [SugarColumn(IsNullable =true, ColumnDataType = "int")]
         public int ParentCompanyId { get; set; }
     }
 

OASystem/OASystem.Domain/Entities/System/Sys_Department.cs

@@ -10,22 +10,22 @@ namespace OASystem.Domain.Entities.System
         /// <summary>
         /// 公司Id
         /// </summary>
-        [SugarColumn(IsNullable =false)]
+        [SugarColumn(IsNullable =true,ColumnDataType ="int")]
         public int CompanyId { get; set; }
         /// <summary>
         /// 部门code
         /// </summary>
-        [SugarColumn(IsNullable = false,Length =50)]
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(20)")]
         public string DepCode { get; set; }
         /// <summary>
         /// 部门名称
         /// </summary>
-        [SugarColumn(IsNullable = false,Length =50)]
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
         public string DepName { get; set; }
         /// <summary>
         /// 父级部门Id
         /// </summary>
-        [SugarColumn(IsNullable = false)]
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
         public int ParentDepId { get; set; }
     }
 }

OASystem/OASystem.Domain/Entities/System/Sys_JobPost.cs

@@ -10,17 +10,17 @@ namespace OASystem.Domain.Entities.System
         /// <summary>
         /// 公司Id
         /// </summary>
-        [SugarColumn(IsNullable =false)]
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
         public int CompanyId { get; set; }
         /// <summary>
         /// 部门Id
         /// </summary>
-        [SugarColumn(IsNullable = false)]
+        [SugarColumn(IsNullable = true,ColumnDataType ="int")]
         public int DepId { get; set; }
         /// <summary>
         /// 岗位名称
         /// </summary>
-        [SugarColumn(IsNullable = false,Length =50)]
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
         public string JobName { get; set; }
        
     }

OASystem/OASystem.Domain/Entities/System/Sys_PageFunctionPermission.cs

@@ -10,17 +10,17 @@ namespace OASystem.Domain.Entities.System
         /// <summary>
         /// 功能名称
         /// </summary>
-        [SugarColumn(IsNullable =false,Length =80)]
+        [SugarColumn(IsNullable =true, ColumnDataType = "varchar(30)")]
         public string FunctionName { get; set; }
         /// <summary>
         /// 功能权限Code
         /// </summary>
-        [SugarColumn(IsNullable = false, Length = 80)]
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(20)")]
         public string FunctionCode { get; set; }
         /// <summary>
         /// 是否启用0否1是
         /// </summary>
-        [SugarColumn(IsNullable = false)]
+        [SugarColumn(IsNullable = true,ColumnDataType ="int")]
         public string IsEnable { get; set; }
     }
 }

OASystem/OASystem.Domain/Entities/System/Sys_SetDataType.cs

@@ -10,13 +10,13 @@ namespace OASystem.Domain.Entities.System
         /// <summary>
         /// 类型名称
         /// </summary>
-        [SugarColumn(Length=50,IsNullable = false)]
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
         public string Name { get; set; }
         /// <summary>
         /// 是否启用
         /// </summary>
-        [SugarColumn(IsNullable = false)]
-        public bool IsEnable { get; set; } = false;
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public bool IsEnable { get; set; } = true;
     }
     /// <summary>
     /// 数据表子类型
@@ -27,13 +27,13 @@ namespace OASystem.Domain.Entities.System
         /// <summary>
         /// 子类型名称
         /// </summary>
-        [SugarColumn(IsNullable = false,Length =50)]
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
         public string Name { get; set; }
        
         /// <summary>
         /// Sys_SetDataType.id 数据类型表Id
         /// </summary>
-        [SugarColumn(IsNullable = false)]
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
         public int STid { get; set; }
 
         

OASystem/OASystem.Domain/Entities/System/Sys_SystemMenuAndFunction.cs

@@ -9,12 +9,12 @@
         /// <summary>
         /// 页面权限Id
         /// </summary>
-        [SugarColumn(IsNullable =false)]
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
         public int SmId { get; set; }
         /// <summary>
         /// 页面功能Id
         /// </summary>
-        [SugarColumn(IsNullable = false)]
+        [SugarColumn(IsNullable = true,ColumnDataType ="int")]
         public int FId { get; set; }
 
     }

OASystem/OASystem.Domain/Entities/System/Sys_SystemMenuPermission.cs

@@ -10,22 +10,22 @@ namespace OASystem.Domain.Entities.System
         /// <summary>
         /// 页面名称
         /// </summary>
-        [SugarColumn(IsNullable =false,Length =80)]
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(80)")]
         public string Name { get; set; }
         /// <summary>
         /// 是否启用
         /// </summary>
-        [SugarColumn(IsNullable = false)]
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
         public int IsEnable { get; set; }
         /// <summary>
         /// 模块Id
         /// </summary>
-        [SugarColumn(IsNullable = false)]
+        [SugarColumn(IsNullable = true,ColumnDataType ="int")]
         public int Mid { get; set; }
         /// <summary>
         /// 页面权限Code
         /// </summary>
-        [SugarColumn(IsNullable = false, Length = 80)]
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(20)")]
         public string SystemMenuCode { get; set; }
     }
 }

OASystem/OASystem.Domain/Entities/System/Sys_Users.cs

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

OASystem/OASystem.Domain/ViewModels/OrderView.cs

@@ -1,30 +0,0 @@
-namespace OASystem.Domain.ViewModels
-{
-    public class OrderView : ViewBase
-    {
-        /// <summary>
-        /// 支付系统单号
-        /// </summary>
-        public string PayNo { get; set; }
-
-        /// <summary>
-        /// 支付创建时间(招行)
-        /// </summary>
-        public string CreatePayTime { get; set; }
-        /// <summary>
-        /// 支付截止时间
-        /// </summary>
-        public string ValidTime { get; set; }
-
-        /// <summary>
-        /// 返回支付类型
-        /// </summary>
-        public string ResultType { get; set; }
-
-        /// <summary>
-        /// 返回支付数据
-        /// </summary>
-        public string Result { get; set; }
-
-    }
-}

OASystem/OASystem.Infrastructure/CDUR/PaymentCDUR.cs

@@ -1,5 +1,4 @@
 using AutoMapper;
-using OASystem.Domain.CMBPayBusiness.Entity;
 using OASystem.Domain.Dtos;
 using Newtonsoft.Json;
 using OASystem.Infrastructure.Repositories;