diff --git a/Tiobon.Core.Model/View/Ghrh/Ghrh_YearHumanApplyOrder.Dto.View.cs b/Tiobon.Core.Model/View/Ghrh/Ghrh_YearHumanApplyOrder.Dto.View.cs index 87ad1823..2a560e3d 100644 --- a/Tiobon.Core.Model/View/Ghrh/Ghrh_YearHumanApplyOrder.Dto.View.cs +++ b/Tiobon.Core.Model/View/Ghrh/Ghrh_YearHumanApplyOrder.Dto.View.cs @@ -32,5 +32,5 @@ public class Ghrh_YearHumanApplyOrderDto : Ghrh_YearHumanApplyOrder /// public string UpdateDataInfo { get; set; } - public List Items { get; set; } + public List Items { get; set; } } diff --git a/Tiobon.Core.Services/Ghrh/Ghrh_YearHumanApplyOrderServices.cs b/Tiobon.Core.Services/Ghrh/Ghrh_YearHumanApplyOrderServices.cs index e7cffb7a..162f39cd 100644 --- a/Tiobon.Core.Services/Ghrh/Ghrh_YearHumanApplyOrderServices.cs +++ b/Tiobon.Core.Services/Ghrh/Ghrh_YearHumanApplyOrderServices.cs @@ -1,4 +1,6 @@ -namespace Tiobon.Core.Services; +using System.Data; + +namespace Tiobon.Core.Services; /// /// 年度人力申请 (服务) @@ -19,7 +21,56 @@ public class Ghrh_YearHumanApplyOrderServices : BaseServices x.WorkID == objId); if (entity != null) - entity.Items = await Db.Queryable().Where(x => x.OrderId == entity.Id).ToListAsync(); + { + var items = await Db.Queryable().Where(x => x.OrderId == entity.Id).ToListAsync(); + + entity.Items = Mapper.Map(items).ToANew>(); + if (entity.Items.Any()) + { + + var deptIds = entity.Items.Select(x => x.DeptId).Distinct().ToList(); + var titleIds = entity.Items.Select(x => x.TitleId).Distinct().ToList(); + var jobIds = entity.Items.Select(x => x.JobId).Distinct().ToList(); + var gradeIds = entity.Items.Select(x => x.GradeId).Distinct().ToList(); + + if (deptIds.Any()) + { + var depts = await Db.Queryable().Where(x => deptIds.Contains(x.DeptID)).Select(x => new { x.DeptID, x.DeptName }).ToListAsync(); + entity.Items.ForEach(x => x.DeptName = depts.FirstOrDefault(o => x.DeptId == o.DeptID)?.DeptName); + } + + if (titleIds.Any()) + { + var titles = await Db.Queryable().Where(x => titleIds.Contains(x.TitleID)).ToListAsync(); + + entity.Items.ForEach(rule => + { + rule.TitleName = titles.FirstOrDefault(o => rule.TitleId == o.TitleID)?.TitleName; + }); + } + + if (gradeIds.Any()) + { + var grades = await Db.Queryable().Where(x => gradeIds.Contains(x.GradeID)).ToListAsync(); + + entity.Items.ForEach(rule => + { + rule.GradeName = grades.FirstOrDefault(o => rule.GradeId == o.GradeID)?.GradeName; + }); + } + + if (jobIds.Any()) + { + var jobs = await Db.Queryable().Where(x => jobIds.Contains(x.JobID)).ToListAsync(); + + entity.Items.ForEach(rule => + { + rule.JobName = jobs.FirstOrDefault(o => rule.JobId == o.JobID)?.JobName; + }); + } + } + } + return ServiceResult.OprateSuccess("查询成功!", entity); } diff --git a/Tiobon.Core.Services/Ghrh/Ghrh_YearHumanSettingsServices.cs b/Tiobon.Core.Services/Ghrh/Ghrh_YearHumanSettingsServices.cs index 03d3a1e0..fe2140b8 100644 --- a/Tiobon.Core.Services/Ghrh/Ghrh_YearHumanSettingsServices.cs +++ b/Tiobon.Core.Services/Ghrh/Ghrh_YearHumanSettingsServices.cs @@ -242,7 +242,19 @@ public class Ghrh_YearHumanSettingsServices : BaseServices x.rowNum).ToList(); #endregion - return ServiceResult>.OprateSuccess("查询成功!", flowReturn.result.JM_TableColumnT1.TableColumn); ; + flowReturn.result.JM_TableColumnT1.TableColumn.ForEach(x => + { + if (x.field == "DeptId") + x.field = "DeptName"; + else if (x.field == "TitleId") + x.field = "TitleName"; + else if (x.field == "JobId") + x.field = "JobName"; + else if (x.field == "GradeId") + x.field = "GradeName"; + }); + + return ServiceResult>.OprateSuccess("查询成功!", flowReturn.result.JM_TableColumnT1.TableColumn); }