学员群里新增人员查看

Tiobon.Core.Api/Tiobon.Core.Model.xml

@@ -29692,6 +29692,46 @@
             性别
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghra_StaffDto.IndateLabel">
+            <summary>
+            入职日期
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghra_StaffDto.StaffType1Label">
+            <summary>
+             员工类别1
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghra_StaffDto.StaffType2Label">
+            <summary>
+             员工类别2
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghra_StaffDto.ZoneName">
+            <summary>
+            厂区
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghra_StaffDto.DeptName">
+            <summary>
+            部门
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghra_StaffDto.TitleName">
+            <summary>
+            岗位
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghra_StaffDto.GradeName">
+            <summary>
+            职等
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghra_StaffDto.JobName">
+            <summary>
+            职务
+            </summary>
+        </member>
         <member name="T:Tiobon.Core.Model.Models.Ghra_StaffEduBGDto">
             <summary>
             Ghra_StaffEduBG(Dto.View1)

Tiobon.Core.Model/View/Ghra/Ghra_Staff.Dto.View.cs

@@ -39,5 +39,43 @@ public class Ghra_StaffDto : Ghra_Staff
     /// 性别
     /// </summary>
     public string GenderLabel { get; set; }
+
+    /// <summary>
+    /// 入职日期
+    /// </summary>
     public string IndateLabel { get; set; }
+
+    /// <summary>
+    ///  员工类别1
+    /// </summary>
+    public string StaffType1Label { get; set; }
+
+    /// <summary>
+    ///  员工类别2
+    /// </summary>
+    public string StaffType2Label { get; set; }
+    /// <summary>
+    /// 厂区
+    /// </summary>
+    public string ZoneName { get; set; }
+
+    /// <summary>
+    /// 部门
+    /// </summary>
+    public string DeptName { get; set; }
+
+    /// <summary>
+    /// 岗位
+    /// </summary>
+    public string TitleName { get; set; }
+
+    /// <summary>
+    /// 职等
+    /// </summary>
+    public string GradeName { get; set; }
+
+    /// <summary>
+    /// 职务
+    /// </summary>
+    public string JobName { get; set; }
 }

Tiobon.Core.Services/Ghre/Ghre_RequestServices.cs

@@ -1,6 +1,4 @@
-using Microsoft.EntityFrameworkCore.Metadata.Internal;
+using Serilog;
-using Serilog;
-using System.Collections.Generic;
 using static Tiobon.Core.Model.Consts;
 
 namespace Tiobon.Core.Services;

Tiobon.Core.Services/Ghre/Ghre_StaffGroupServices.cs

@@ -1,4 +1,7 @@
-namespace Tiobon.Core.Services;
+using MySqlX.XDevAPI.Common;
+using Org.BouncyCastle.Utilities;
+
+namespace Tiobon.Core.Services;
 
 /// <summary>
 /// 员工群组 (服务)
@@ -281,6 +284,7 @@ public class Ghre_StaffGroupServices : BaseServices<Ghre_StaffGroup, Ghre_StaffG
 
         #region 处理查询条件 
         var whereExpression = Expressionable.Create<Ghra_Staff>();
+        if (filter.jsonParam != null)
             foreach (JProperty jProperty in filter.jsonParam.Properties())
             {
                 var name = jProperty.Name;
@@ -354,9 +358,41 @@ public class Ghre_StaffGroupServices : BaseServices<Ghre_StaffGroup, Ghre_StaffG
             .Where(whereExpression.ToExpression())
             .OrderBy(it => new { UpdateTime = SqlFunc.Desc(it.UpdateTime), CreateTime = SqlFunc.Desc(it.CreateTime) })
             .ToPageListAsync(filter.pageNum, filter.pageSize, total);
-        var result = new ServicePageResult<Ghra_StaffDto>(filter.pageNum, total, filter.pageSize, Mapper.Map(entitys).ToANew<List<Ghra_StaffDto>>());
+        var data = Mapper.Map(entitys).ToANew<List<Ghra_StaffDto>>();
 
+        var zoneIds = data.Where(x => x.ZoneID != null).Select(x => x.ZoneID.Value).ToList();
+        var zones = await Db.Queryable<Ghra_Zone>().Where(x => x.ZoneID != null && zoneIds.Contains(x.ZoneID.Value)).ToListAsync();
 
-        return result;
+        var deptIds = data.Where(x => x.DeptID != null).Select(x => x.DeptID.Value).ToList();
+        var depts = await Db.Queryable<Ghro_Dept>().Where(x => x.DeptID != null && deptIds.Contains(x.DeptID.Value)).ToListAsync();
+
+        var titleIds = data.Where(x => x.TitleID != null).Select(x => x.TitleID.Value).ToList();
+        var titles = await Db.Queryable<Ghra_Title>().Where(x => x.TitleID != null && titleIds.Contains(x.TitleID.Value)).ToListAsync();
+
+        var gradeIds = data.Where(x => x.GradeID != null).Select(x => x.GradeID.Value).ToList();
+        var grades = await Db.Queryable<Ghra_Grade>().Where(x => gradeIds.Contains(x.GradeID)).ToListAsync();
+
+        var jobIds = data.Where(x => x.JobID != null).Select(x => x.JobID.Value).ToList();
+        var jobs = await Db.Queryable<Ghra_Job>().Where(x => x.JobID != null && jobIds.Contains(x.JobID.Value)).ToListAsync();
+
+        data.ForEach(async x =>
+        {
+            x.GenderLabel = await GetParaLabel("Gender", x.Gender);
+            x.IndateLabel = DateTimeHelper.ConvertToDayString(x.Indate);
+            x.StaffType1Label = await GetParaLabel(x.StaffType1);
+            x.StaffType2Label = await GetParaLabel(x.StaffType2);
+            if (x.ZoneID != null)
+                x.ZoneName = zones.Where(o => o.ZoneID == x.ZoneID).FirstOrDefault()?.ZoneName;
+            if (x.DeptID != null)
+                x.DeptName = depts.Where(o => o.DeptID == x.DeptID).FirstOrDefault()?.DeptName;
+            if (x.GradeID != null)
+                x.GradeName = grades.Where(o => o.GradeID == x.GradeID).FirstOrDefault()?.GradeName;
+            if (x.JobID != null)
+                x.JobName = jobs.Where(o => o.JobID == x.JobID).FirstOrDefault()?.JobName;
+            if (x.TitleID != null)
+                x.TitleName = titles.Where(o => o.TitleID == x.TitleID).FirstOrDefault()?.TitleName;
+        });
+
+        return new ServicePageResult<Ghra_StaffDto>(filter.pageNum, total, filter.pageSize, data);
     }
 }

Tiobon.Core/Tiobon.Core.Model.xml

@@ -29692,6 +29692,46 @@
             性别
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghra_StaffDto.IndateLabel">
+            <summary>
+            入职日期
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghra_StaffDto.StaffType1Label">
+            <summary>
+             员工类别1
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghra_StaffDto.StaffType2Label">
+            <summary>
+             员工类别2
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghra_StaffDto.ZoneName">
+            <summary>
+            厂区
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghra_StaffDto.DeptName">
+            <summary>
+            部门
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghra_StaffDto.TitleName">
+            <summary>
+            岗位
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghra_StaffDto.GradeName">
+            <summary>
+            职等
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghra_StaffDto.JobName">
+            <summary>
+            职务
+            </summary>
+        </member>
         <member name="T:Tiobon.Core.Model.Models.Ghra_StaffEduBGDto">
             <summary>
             Ghra_StaffEduBG(Dto.View1)