新增员工附属部门

Admin.Core.Model/Enums/Sex.cs

@@ -0,0 +1,23 @@
+namespace Admin.Core.Model.Enums
+{
+    /// <summary>
+    /// 性别
+    /// </summary>
+    public enum Sex
+    {
+        /// <summary>
+        /// 男
+        /// </summary>
+        Male = 1,
+
+        /// <summary>
+        /// 女
+        /// </summary>
+        Female = 2,
+
+        /// <summary>
+        /// 未知
+        /// </summary>
+        Unknown = 3
+    }
+}

Admin.Core.Model/Personnel/EmployeeEntity.cs

@@ -1,5 +1,6 @@
 using Admin.Core.Common.BaseModel;
 using Admin.Core.Model.Admin;
+using Admin.Core.Model.Enums;
 using FreeSql.DataAnnotations;
 using System;
 
@@ -9,7 +10,7 @@ namespace Admin.Core.Model.Personnel
     /// 员工
     /// </summary>
 	[Table(Name = "pe_employee")]
-    [Index("idx_{tablename}_01", nameof(EmpNo) + "," + nameof(TenantId), true)]
+    [Index("idx_{tablename}_01", nameof(Code) + "," + nameof(TenantId), true)]
     public class EmployeeEntity : EntityFull, ITenant
     {
         /// <summary>
@@ -21,9 +22,9 @@ namespace Admin.Core.Model.Personnel
         public TenantEntity Tenant { get; set; }
 
         /// <summary>
-        /// 工号
+        /// 员工编号
         /// </summary>
-        public string EmpNo { get; set; }
+        public string Code { get; set; }
 
         /// <summary>
         /// 部门Id
@@ -31,5 +32,23 @@ namespace Admin.Core.Model.Personnel
         public long OrganizationId { get; set; }
 
         public OrganizationEntity Organization { get; set; }
+
+        /// <summary>
+        /// 性别
+        /// </summary>
+        public Sex Sex { get; set; }
+
+        /// <summary>
+        /// 手机号
+        /// </summary>
+        [Column(StringLength = 20)]
+        public string Phone { get; set; }
+
+        /// <summary>
+        /// 职位Id
+        /// </summary>
+        public long PositionId { get; set; }
+
+        public PositionEntity Position { get; set; }
     }
 }

Admin.Core.Model/Personnel/EmployeeOrganizationEntity.cs

@@ -0,0 +1,33 @@
+using Admin.Core.Common.BaseModel;
+using FreeSql.DataAnnotations;
+
+namespace Admin.Core.Model.Personnel
+{
+    /// <summary>
+    /// 员工附属部门
+    /// </summary>
+	[Table(Name = "ad_employee_organization")]
+    [Index("idx_{tablename}_01", nameof(EmployeeId) + "," + nameof(OrganizationId), true)]
+    public class EmployeeOrganizationEntity : EntityAdd
+    {
+        /// <summary>
+        /// 员工Id
+        /// </summary>
+		public long EmployeeId { get; set; }
+
+        /// <summary>
+        /// 员工
+        /// </summary>
+        public EmployeeEntity Employee { get; set; }
+
+        /// <summary>
+        /// 部门Id
+        /// </summary>
+		public long OrganizationId { get; set; }
+
+        /// <summary>
+        /// 部门
+        /// </summary>
+        public OrganizationEntity Organization { get; set; }
+    }
+}

Admin.Core.Model/Personnel/OrganizationEntity.cs

@@ -43,6 +43,16 @@ namespace Admin.Core.Model.Personnel
         [Column(StringLength = 50)]
         public string Value { get; set; }
 
+        /// <summary>
+        /// 主管
+        /// </summary>
+        public long PrimaryUserId { get; set; }
+
+        /// <summary>
+        /// 员工人数
+        /// </summary>
+        public int EmployeeCount { get; set; }
+
         /// <summary>
         /// 描述
         /// </summary>

Admin.Core.Repository/Base/DbHelper.cs

@@ -413,11 +413,11 @@ namespace Admin.Core.Repository
                         await dualRepo.InsertAsync(new DualEntity { });
                     }
 
+                    //admin
                     //await InitDtDataAsync(db, uow, tran, data.Dictionaries, dbConfig);
                     await InitDtDataAsync(db, uow, tran, data.ApiTree, dbConfig);
                     await InitDtDataAsync(db, uow, tran, data.ViewTree, dbConfig);
                     await InitDtDataAsync(db, uow, tran, data.PermissionTree, dbConfig);
-                    await InitDtDataAsync(db, uow, tran, data.OrganizationTree, dbConfig);
                     await InitDtDataAsync(db, uow, tran, data.Users, dbConfig);
                     await InitDtDataAsync(db, uow, tran, data.Roles, dbConfig);
                     await InitDtDataAsync(db, uow, tran, data.UserRoles, dbConfig);
@@ -426,6 +426,9 @@ namespace Admin.Core.Repository
                     await InitDtDataAsync(db, uow, tran, data.TenantPermissions, dbConfig);
                     await InitDtDataAsync(db, uow, tran, data.PermissionApis, dbConfig);
 
+                    //人事
+                    await InitDtDataAsync(db, uow, tran, data.OrganizationTree, dbConfig);
+
                     uow.Commit();
                 }
 
@@ -452,7 +455,7 @@ namespace Admin.Core.Repository
                 Console.WriteLine("\r\n generate data started");
 
                 #region 数据表
-
+                //admin
                 #region 数据字典
 
                 //var dictionaries = await db.Queryable<DictionaryEntity>().ToListAsync(a => new
@@ -623,7 +626,7 @@ namespace Admin.Core.Repository
 
                 #endregion
 
-
+                //人事
                 #region 组织机构
 
                 var organizations = await db.Queryable<OrganizationEntity>().ToListAsync<OrganizationDataOutput>();
@@ -669,7 +672,9 @@ namespace Admin.Core.Repository
                     rolePermissions,
                     tenants,
                     tenantPermissions,
-                    permissionApis
+                    permissionApis,
+
+                    organizationTree
                 },
                 //Formatting.Indented,
                 settings

Admin.Core/Admin.Core.Model.xml

@@ -669,6 +669,26 @@
             排序
             </summary>
         </member>
+        <member name="T:Admin.Core.Model.Enums.Sex">
+            <summary>
+            性别
+            </summary>
+        </member>
+        <member name="F:Admin.Core.Model.Enums.Sex.Male">
+            <summary>
+            男
+            </summary>
+        </member>
+        <member name="F:Admin.Core.Model.Enums.Sex.Female">
+            <summary>
+            女
+            </summary>
+        </member>
+        <member name="F:Admin.Core.Model.Enums.Sex.Unknown">
+            <summary>
+            未知
+            </summary>
+        </member>
         <member name="T:Admin.Core.Model.Personnel.EmployeeEntity">
             <summary>
             员工
@@ -679,9 +699,9 @@
             租户Id
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.Personnel.EmployeeEntity.EmpNo">
+        <member name="P:Admin.Core.Model.Personnel.EmployeeEntity.Code">
             <summary>
-            工号
+            员工编号
             </summary>
         </member>
         <member name="P:Admin.Core.Model.Personnel.EmployeeEntity.OrganizationId">
@@ -689,6 +709,46 @@
             部门Id
             </summary>
         </member>
+        <member name="P:Admin.Core.Model.Personnel.EmployeeEntity.Sex">
+            <summary>
+            性别
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.Personnel.EmployeeEntity.Phone">
+            <summary>
+            手机号
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.Personnel.EmployeeEntity.PositionId">
+            <summary>
+            职位Id
+            </summary>
+        </member>
+        <member name="T:Admin.Core.Model.Personnel.EmployeeOrganizationEntity">
+            <summary>
+            员工附属部门
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.Personnel.EmployeeOrganizationEntity.EmployeeId">
+            <summary>
+            员工Id
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.Personnel.EmployeeOrganizationEntity.Employee">
+            <summary>
+            员工
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.Personnel.EmployeeOrganizationEntity.OrganizationId">
+            <summary>
+            部门Id
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.Personnel.EmployeeOrganizationEntity.Organization">
+            <summary>
+            部门
+            </summary>
+        </member>
         <member name="T:Admin.Core.Model.Personnel.OrganizationEntity">
             <summary>
             组织架构
@@ -719,6 +779,16 @@
             值
             </summary>
         </member>
+        <member name="P:Admin.Core.Model.Personnel.OrganizationEntity.PrimaryUserId">
+            <summary>
+            主管
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.Personnel.OrganizationEntity.EmployeeCount">
+            <summary>
+            员工人数
+            </summary>
+        </member>
         <member name="P:Admin.Core.Model.Personnel.OrganizationEntity.Description">
             <summary>
             描述
@@ -734,5 +804,40 @@
             排序
             </summary>
         </member>
+        <member name="T:Admin.Core.Model.Personnel.PositionEntity">
+            <summary>
+            职位
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.Personnel.PositionEntity.TenantId">
+            <summary>
+            租户Id
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.Personnel.PositionEntity.Name">
+            <summary>
+            名称
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.Personnel.PositionEntity.Code">
+            <summary>
+            编码
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.Personnel.PositionEntity.Description">
+            <summary>
+            说明
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.Personnel.PositionEntity.Enabled">
+            <summary>
+            启用
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.Personnel.PositionEntity.Sort">
+            <summary>
+            排序
+            </summary>
+        </member>
     </members>
 </doc>