From f40ea9db7b44b994ba6be57b8522c06c3d7cf085 Mon Sep 17 00:00:00 2001 From: xiaochanghai Date: Tue, 26 Nov 2024 11:41:31 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AE=80=E5=8E=86=E5=BA=93=20=E8=A1=A5?= =?UTF-8?q?=E5=85=85=E9=80=BB=E8=BE=91=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Tiobon.Core.Api/Tiobon.Core.Model.xml | 22 ++- .../View/Ghrh/Ghrh_Resume.Dto.View.cs | 20 ++- .../Ghrh/Ghrh_ResumeServices.cs | 46 ++++- Tiobon.Core/Tiobon.Core.Model.xml | 165 ++++++++++++++++++ Tiobon.Core/Tiobon.Core.xml | 6 + 5 files changed, 251 insertions(+), 8 deletions(-) diff --git a/Tiobon.Core.Api/Tiobon.Core.Model.xml b/Tiobon.Core.Api/Tiobon.Core.Model.xml index a3976e14..f7a13e7e 100644 --- a/Tiobon.Core.Api/Tiobon.Core.Model.xml +++ b/Tiobon.Core.Api/Tiobon.Core.Model.xml @@ -22234,7 +22234,7 @@ - 雪梨 + 学历 @@ -22352,6 +22352,26 @@ 是否可以评估 + + + 生日 + + + + + 用人部门 + + + + + 用人岗位 + + + + + 面试官 + + 教育背景(Dto.View1) diff --git a/Tiobon.Core.Model/View/Ghrh/Ghrh_Resume.Dto.View.cs b/Tiobon.Core.Model/View/Ghrh/Ghrh_Resume.Dto.View.cs index 8dbb5504..e51ee587 100644 --- a/Tiobon.Core.Model/View/Ghrh/Ghrh_Resume.Dto.View.cs +++ b/Tiobon.Core.Model/View/Ghrh/Ghrh_Resume.Dto.View.cs @@ -48,7 +48,7 @@ public class Ghrh_ResumeDto : Ghrh_Resume public string GenderLabel { get; set; } /// - /// 雪梨 + /// 学历 /// public string EducationLabel { get; set; } @@ -169,5 +169,23 @@ public class Ghrh_ResumeDto : Ghrh_Resume /// public bool? IsAllowAssess { get; set; } + /// + /// 生日 + /// + public string Birthday1 { get; set; } + + /// + /// 用人部门 + /// + public string HireDeptName { get; set; } + /// + /// 用人岗位 + /// + public string HireTitleName { get; set; } + + /// + /// 面试官 + /// + public string Interviewer { get; set; } } diff --git a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs index 05db2cba..31b22fec 100644 --- a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs +++ b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs @@ -1,6 +1,4 @@ -using Microsoft.IdentityModel.Tokens; -using Org.BouncyCastle.Crypto; -using static Tiobon.Core.Model.Consts; +using static Tiobon.Core.Model.Consts; namespace Tiobon.Core.Services; @@ -12,6 +10,10 @@ public class Ghrh_ResumeServices : BaseServices _dal; private readonly IGhrh_ResumeEduBGServices _ghrh_ResumeEduBGServices; private readonly IGhrh_ResumeWorkExpServices _ghrh_ResumeWorkExpServices; + + /// + /// 标签 + /// private readonly IGhrh_ResumeTagServices _ghrh_ResumeTagServices; /// /// 家庭关系 @@ -276,6 +278,7 @@ public class Ghrh_ResumeServices : BaseServices x.Id == o.ResumeId).ToList(); x.WorkExp = workExps.Where(o => x.Id == o.ResumeId).ToList(); @@ -332,6 +336,19 @@ public class Ghrh_ResumeServices : BaseServices>(x.Tags); x.TagList = tags.Where(o => tagIds1.Contains(o.Id)).Select(o => o.TagName).ToList(); } + + #region 计算年龄 + if (x.Birthday != null && x.Birthday > DateTime.MinValue) + { + DateTime birthdate = (DateTime)x.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--; + x.Age = age; + } + #endregion + x.Birthday1 = DateTimeHelper.ConvertToDayString(x.Birthday); }); return list[0]; @@ -987,15 +1004,32 @@ END"; resume.Base.ApplicationTime = DateTime.Now; if (status == "Submit") resume.Base.Status = DIC_INTERVIEW_ORDER_STATUS.WaitRecommended; - + resume.Base.ApplyStatus = resume.Base.ApplyStatus ?? "Dimission"; var entity = await base.QueryById(id); - if (entity != null && entity.Status != DIC_INTERVIEW_ORDER_STATUS.WaitRecommended) - resume.Base.Status = entity.Status; + if (entity != null) + { + if (entity.Status != DIC_INTERVIEW_ORDER_STATUS.WaitRecommended) + resume.Base.Status = entity.Status; + resume.Base.Tags = entity.Tags; + } if (resume.Base.Status.IsNullOrEmpty()) resume.Base.Status = DIC_INTERVIEW_ORDER_STATUS.WaitRecommended; if (resume.Base.PhotoUrls != null && resume.Base.PhotoUrls.Any()) resume.Base.PhotoUrl = resume.Base.PhotoUrls[0].RelativePath; + + #region 计算年龄 + if (resume.Base.Birthday != null && resume.Base.Birthday > DateTime.MinValue) + { + DateTime birthdate = (DateTime)resume.Base.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--; + resume.Base.Age = age; + } + #endregion + await base.Update(id, resume.Base); await _ghrh_ResumeHomeServices.Delete(x => x.ResumeId != null && x.ResumeId == id);//家庭关系 diff --git a/Tiobon.Core/Tiobon.Core.Model.xml b/Tiobon.Core/Tiobon.Core.Model.xml index 23f893a4..f7a13e7e 100644 --- a/Tiobon.Core/Tiobon.Core.Model.xml +++ b/Tiobon.Core/Tiobon.Core.Model.xml @@ -22217,6 +22217,161 @@ 修改信息 + + + 职位 + + + + + 职位 + + + + + 性别 + + + + + 学历 + + + + + 民族 + + + + + 婚姻状况 + + + + + 政治面貌 + + + + + 证照类型 + + + + + 户口性质 + + + + + 求职状态 + + + + + 标签 + + + + + 标签 + + + + + 标签 + + + + + 教育背景 + + + + + 工作经历 + + + + + 简历ID + + + + + 面试单号 + + + + + 推荐时间 + + + + + 轮数,初试/复试或者一轮二轮三轮 + + + + + 是否通过 + + + + + 面试结果 + + + + + 是否通过 + + + + + 订单状态 + + + + + 员工ID + + + + + 取消原因 + + + + + 是否取消 + + + + + 是否可以评估 + + + + + 生日 + + + + + 用人部门 + + + + + 用人岗位 + + + + + 面试官 + + 教育背景(Dto.View1) @@ -22247,6 +22402,16 @@ 修改信息 + + + 性别 + + + + + 关系 + + 简历信息栏位(Dto.View1) diff --git a/Tiobon.Core/Tiobon.Core.xml b/Tiobon.Core/Tiobon.Core.xml index 330b51c3..79d676da 100644 --- a/Tiobon.Core/Tiobon.Core.xml +++ b/Tiobon.Core/Tiobon.Core.xml @@ -1578,6 +1578,12 @@ + + + Index + + + 简历培训记录(Controller)