diff --git a/Tiobon.Core.Model/View/Ghrh/Ghrh_InterviewOrder.Dto.View.cs b/Tiobon.Core.Model/View/Ghrh/Ghrh_InterviewOrder.Dto.View.cs index 7861a84f..be432cff 100644 --- a/Tiobon.Core.Model/View/Ghrh/Ghrh_InterviewOrder.Dto.View.cs +++ b/Tiobon.Core.Model/View/Ghrh/Ghrh_InterviewOrder.Dto.View.cs @@ -91,5 +91,6 @@ public class Ghrh_InterviewOrderDto : Ghrh_InterviewOrder /// 需求单号 /// public string RequestNo { get; set; } - + public DateTime? Birthday { get; set; } + } diff --git a/Tiobon.Core.Services/Ghrh/Ghrh_InterviewOrderServices.cs b/Tiobon.Core.Services/Ghrh/Ghrh_InterviewOrderServices.cs index 0d95252c..18b398f0 100644 --- a/Tiobon.Core.Services/Ghrh/Ghrh_InterviewOrderServices.cs +++ b/Tiobon.Core.Services/Ghrh/Ghrh_InterviewOrderServices.cs @@ -1,4 +1,6 @@ -namespace Tiobon.Core.Services; +using MySqlX.XDevAPI.Common; + +namespace Tiobon.Core.Services; /// /// 面试工单 (服务) @@ -67,18 +69,10 @@ public class Ghrh_InterviewOrderServices : BaseServices(filter.pageNum, total, filter.pageSize, entitys); var list = result.result.DT_TableDataT1; - - var resumeIds = list.Where(x => x.ResumeId != null).Select(x => x.ResumeId).ToList(); - var requestIds = list.Where(x => x.RequestId != null).Select(x => x.RequestId).ToList(); - - var resumes = await Db.Queryable().Where(x => resumeIds.Contains(x.Id)).ToListAsync(); - var requests = await Db.Queryable().Where(x => requestIds.Contains(x.Id)).ToListAsync(); - var titleIds = resumes.Where(x => x.TitleId != null).Select(x => x.TitleId.Value).Distinct().ToList(); - var titles = await Db.Queryable().Where(x => x.TitleID != null && titleIds.Contains(x.TitleID.Value)).ToListAsync(); var tagIds = new List(); - resumes.ForEach(x => + list.ForEach(x => { - if (x.Tags.IsNotEmptyOrNull()) - tagIds.AddRange(JsonHelper.JsonToObj>(x.Tags)); + if (x.Tag.IsNotEmptyOrNull()) + tagIds.AddRange(JsonHelper.JsonToObj>(x.Tag)); }); tagIds = tagIds.Distinct().ToList(); var tags = await Db.Queryable().Where(x => tagIds.Contains(x.Id)).ToListAsync(); for (int i = 0; i < list.Count; i++) { - var entity = list[i]; - var resume = resumes.Where(x => x.Id == entity.ResumeId).FirstOrDefault(); - if (resume != null) - { - entity.StaffName = resume.StaffName; - entity.IdCardNo = resume.IdCardNo; - entity.CertificateType = await GetParaLabel("D51", resume.CertificateType); - entity.EduDegree = await GetParaLabel("EducationalBGLevel", resume.EduDegree); - entity.Gender = await GetParaLabel("Gender", resume.Gender); - if (resume.TitleId != null) entity.TitleName = titles.Where(o => o.TitleID == resume.TitleId).FirstOrDefault()?.TitleName; - - if (resume.Tags.IsNotEmptyOrNull()) - { - var tagIds1 = JsonHelper.JsonToObj>(resume.Tags); - - var TagList = tags.Where(o => tagIds1.Contains(o.Id)).Select(o => o.TagName).ToList(); - entity.Tag = string.Join(",", TagList); - } + var entity = list[i]; + entity.CertificateType = await GetParaLabel("D51", entity.CertificateType); + entity.EduDegree = await GetParaLabel("EducationalBGLevel", entity.EduDegree); + entity.Gender = await GetParaLabel("Gender", entity.Gender); - #region 计算年龄 - if (resume.Birthday != null && resume.Birthday > DateTime.MinValue) - { - DateTime birthdate = (DateTime)resume.Birthday; - DateTime now = DateTime.Now; - int age = now.Year - birthdate.Year; - if (now.Month < birthdate.Month || (now.Month == birthdate.Month && now.Day < birthdate.Day)) - age--; - entity.Age = age; - } - #endregion + if (entity.Tag.IsNotEmptyOrNull()) + { + var tagIds1 = JsonHelper.JsonToObj>(entity.Tag); - switch (entity.Status) - { - case "Fail": - entity.StatusLabel = "不合适"; - break; - case "HasRecommended": - entity.StatusLabel = "待预约"; - break; - case "Hire": - entity.StatusLabel = "不合适"; - break; - default: - entity.StatusLabel = "已约面"; - break; - } + var TagList = tags.Where(o => tagIds1.Contains(o.Id)).Select(o => o.TagName).ToList(); + entity.Tag = string.Join(",", TagList); } - if (entity.RequestId != null) + #region 计算年龄 + if (entity.Birthday != null && entity.Birthday > DateTime.MinValue) { - var request = requests.Where(x => x.Id == entity.RequestId).FirstOrDefault(); - entity.RequestNo = request.RequestNo; + DateTime birthdate = (DateTime)entity.Birthday; + DateTime now = DateTime.Now; + int age = now.Year - birthdate.Year; + if (now.Month < birthdate.Month || (now.Month == birthdate.Month && now.Day < birthdate.Day)) + age--; + entity.Age = age; } + #endregion + + switch (entity.Status) + { + case "Fail": + entity.StatusLabel = "不合适"; + break; + case "HasRecommended": + entity.StatusLabel = "待预约"; + break; + case "Hire": + entity.StatusLabel = "已逾期"; + break; + default: + entity.StatusLabel = "已约面"; + break; + } if (entity.IdCardNo.IsNotEmptyOrNull()) { int length = entity.IdCardNo.Length; diff --git a/Tiobon.Core.Services/Ghrh/Ghrh_InterviewRecordServices.cs b/Tiobon.Core.Services/Ghrh/Ghrh_InterviewRecordServices.cs index 59a6a2a6..fb5407ad 100644 --- a/Tiobon.Core.Services/Ghrh/Ghrh_InterviewRecordServices.cs +++ b/Tiobon.Core.Services/Ghrh/Ghrh_InterviewRecordServices.cs @@ -157,7 +157,10 @@ public class Ghrh_InterviewRecordServices : BaseServices