新增员工岗位和部门数据的查询

Admin.Core.Model/Personnel/EmployeeEntity.cs

@@ -44,7 +44,7 @@ namespace Admin.Core.Model.Personnel
         /// <summary>
         /// 性别
         /// </summary>
-        public Sex Sex { get; set; }
+        public Sex? Sex { get; set; }
 
         /// <summary>
         /// 工号
@@ -91,7 +91,7 @@ namespace Admin.Core.Model.Personnel
         /// <summary>
         /// 入职时间
         /// </summary>
-        public DateTime HireDate { get; set; }
+        public DateTime? EntryTime { get; set; }
 
         [Navigate(ManyToMany = typeof(EmployeeOrganizationEntity))]
         public ICollection<OrganizationEntity> Organizations { get; set; }

Admin.Core.Service/Personnel/Employee/EmployeeService.cs

@@ -35,13 +35,16 @@ namespace Admin.Core.Service.Personnel.Employee
         {
             var res = new ResponseOutput<EmployeeGetOutput>();
 
-            var entity = await _employeeRepository.Select
+            var dto = await _employeeRepository.Select
             .WhereDynamic(id)
             .IncludeMany(a => a.Organizations.Select(b => new OrganizationEntity { Id = b.Id }))
-            .ToOneAsync();
+            .ToOneAsync(a => new EmployeeGetOutput
+            {
+                OrganizationName = a.Organization.Name,
+                PositionName = a.Position.Name
+            });
 
-            var entityDto = Mapper.Map<EmployeeGetOutput>(entity);
-            return res.Ok(entityDto);
+            return res.Ok(dto);
         }
 
         public async Task<IResponseOutput> PageAsync(PageInput<EmployeeEntity> input)
@@ -52,11 +55,15 @@ namespace Admin.Core.Service.Personnel.Employee
             .OrderByDescending(true, a => a.Id)
             .IncludeMany(a => a.Organizations.Select(b => new OrganizationEntity { Name = b.Name }))
             .Page(input.CurrentPage, input.PageSize)
-            .ToListAsync();
+            .ToListAsync(a => new EmployeeListOutput 
+            { 
+                OrganizationName = a.Organization.Name, 
+                PositionName = a.Position.Name
+            });
 
             var data = new PageOutput<EmployeeListOutput>()
             {
-                List = Mapper.Map<List<EmployeeListOutput>>(list),
+                List = list,
                 Total = total
             };
 

Admin.Core.Service/Personnel/Employee/Input/EmployeeAddInput.cs

@@ -62,6 +62,6 @@ namespace Admin.Core.Service.Personnel.Employee.Input
         /// <summary>
         /// 入职时间
         /// </summary>
-        public DateTime HireDate { get; set; }
+        public DateTime? EntryTime { get; set; }
     }
 }

Admin.Core.Service/Personnel/Employee/Output/EmployeeGetOutput.cs

@@ -4,5 +4,19 @@ namespace Admin.Core.Service.Personnel.Employee.Output
 {
     public class EmployeeGetOutput : EmployeeUpdateInput
     {
+        /// <summary>
+        /// 主属部门
+        /// </summary>
+        public string OrganizationName { get; set; }
+
+        /// <summary>
+        /// 附属部门
+        /// </summary>
+        public string[] OrganizationNames { get; set; }
+
+        /// <summary>
+        /// 职位
+        /// </summary>
+        public string PositionName { get; set; }
     }
 }

Admin.Core.Service/Personnel/Employee/Output/EmployeeListOutput.cs

@@ -27,7 +27,7 @@ namespace Admin.Core.Service.Personnel.Employee.Output
         /// <summary>
         /// 主属部门
         /// </summary>
-        public long OrganizationName { get; set; }
+        public string OrganizationName { get; set; }
 
         /// <summary>
         /// 附属部门

Admin.Core/Admin.Core.Model.xml

@@ -794,7 +794,7 @@
             邮箱
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.Personnel.EmployeeEntity.HireDate">
+        <member name="P:Admin.Core.Model.Personnel.EmployeeEntity.EntryTime">
             <summary>
             入职时间
             </summary>

Admin.Core/Admin.Core.Service.xml

@@ -1897,7 +1897,7 @@
             邮箱
             </summary>
         </member>
-        <member name="P:Admin.Core.Service.Personnel.Employee.Input.EmployeeAddInput.HireDate">
+        <member name="P:Admin.Core.Service.Personnel.Employee.Input.EmployeeAddInput.EntryTime">
             <summary>
             入职时间
             </summary>
@@ -1917,6 +1917,21 @@
             版本
             </summary>
         </member>
+        <member name="P:Admin.Core.Service.Personnel.Employee.Output.EmployeeGetOutput.OrganizationName">
+            <summary>
+            主属部门
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Service.Personnel.Employee.Output.EmployeeGetOutput.OrganizationNames">
+            <summary>
+            附属部门
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Service.Personnel.Employee.Output.EmployeeGetOutput.PositionName">
+            <summary>
+            职位
+            </summary>
+        </member>
         <member name="P:Admin.Core.Service.Personnel.Employee.Output.EmployeeListOutput.Id">
             <summary>
             主键Id