Bladeren bron

新增员工导入和导出数据
更新初始化数据包

zhontai 3 jaren geleden
bovenliggende
commit
389568aebf

+ 1 - 0
Admin.Core.Repository/Base/Data.cs

@@ -24,5 +24,6 @@ namespace Admin.Core.Repository
 
         public PositionEntity[] Positions { get; set; }
         public OrganizationEntity[] OrganizationTree { get; set; }
+        public EmployeeEntity[] Employees { get; set; }
     }
 }

+ 8 - 1
Admin.Core.Repository/Base/DbHelper.cs

@@ -430,6 +430,7 @@ namespace Admin.Core.Repository
                     //人事
                     await InitDtDataAsync(db, uow, tran, data.Positions, dbConfig);
                     await InitDtDataAsync(db, uow, tran, data.OrganizationTree, dbConfig);
+                    await InitDtDataAsync(db, uow, tran, data.Employees, dbConfig);
 
                     uow.Commit();
                 }
@@ -628,6 +629,11 @@ namespace Admin.Core.Repository
 
                 #endregion
 
+                #region 员工
+
+                var employees = await db.Queryable<EmployeeEntity>().ToListAsync<EmployeeDataOutput>();
+
+                #endregion
                 #endregion
 
                 if (!(users?.Count > 0))
@@ -656,7 +662,8 @@ namespace Admin.Core.Repository
                     tenantPermissions,
                     permissionApis,
                     organizationTree,
-                    positions
+                    positions,
+                    employees
                 },
                 //Formatting.Indented,
                 settings

+ 77 - 0
Admin.Core.Repository/Personnel/Employee/Output/EmployeeDataOutput.cs

@@ -0,0 +1,77 @@
+using Admin.Core.Model.Enums;
+using System;
+
+namespace Admin.Core.Repository.Personnel.Output
+{
+    /// <summary>
+    /// 员工数据导出
+    /// </summary>
+    public partial class EmployeeDataOutput
+    {
+        /// <summary>
+        /// 租户Id
+        /// </summary>
+        public long? TenantId { get; set; }
+
+        /// <summary>
+        /// 员工Id
+        /// </summary>
+        public long Id { get; set; }
+
+        /// <summary>
+        /// 用户Id
+        /// </summary>
+        public long? UserId { get; set; }
+
+        /// <summary>
+        /// 姓名
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// 昵称
+        /// </summary>
+        public string NickName { get; set; }
+
+        /// <summary>
+        /// 性别
+        /// </summary>
+        public Sex Sex { get; set; }
+
+        /// <summary>
+        /// 工号
+        /// </summary>
+        public string Code { get; set; }
+
+        /// <summary>
+        /// 主属部门Id
+        /// </summary>
+        public long OrganizationId { get; set; }
+
+        /// <summary>
+        /// 主管Id
+        /// </summary>
+        public long? PrimaryEmployeeId { get; set; }
+
+        /// <summary>
+        /// 职位Id
+        /// </summary>
+        public long PositionId { get; set; }
+
+        /// <summary>
+        /// 手机号
+        /// </summary>
+        public string Phone { get; set; }
+
+        /// <summary>
+        /// 邮箱
+        /// </summary>
+        public string Email { get; set; }
+
+        /// <summary>
+        /// 入职时间
+        /// </summary>
+        public DateTime HireDate { get; set; }
+
+    }
+}

File diff suppressed because it is too large
+ 0 - 0
Admin.Core/Db/Data/data-share.json


File diff suppressed because it is too large
+ 0 - 0
Admin.Core/Db/Data/data.json


Some files were not shown because too many files changed in this diff