diff --git a/Tiobon.Core.Api/Tiobon.Core.Model.xml b/Tiobon.Core.Api/Tiobon.Core.Model.xml
index 23f893a4..a3976e14 100644
--- a/Tiobon.Core.Api/Tiobon.Core.Model.xml
+++ b/Tiobon.Core.Api/Tiobon.Core.Model.xml
@@ -22217,6 +22217,141 @@
修改信息
+
+
+ 职位
+
+
+
+
+ 职位
+
+
+
+
+ 性别
+
+
+
+
+ 雪梨
+
+
+
+
+ 民族
+
+
+
+
+ 婚姻状况
+
+
+
+
+ 政治面貌
+
+
+
+
+ 证照类型
+
+
+
+
+ 户口性质
+
+
+
+
+ 求职状态
+
+
+
+
+ 标签
+
+
+
+
+ 标签
+
+
+
+
+ 标签
+
+
+
+
+ 教育背景
+
+
+
+
+ 工作经历
+
+
+
+
+ 简历ID
+
+
+
+
+ 面试单号
+
+
+
+
+ 推荐时间
+
+
+
+
+ 轮数，初试/复试或者一轮二轮三轮
+
+
+
+
+ 是否通过
+
+
+
+
+ 面试结果
+
+
+
+
+ 是否通过
+
+
+
+
+ 订单状态
+
+
+
+
+ 员工ID
+
+
+
+
+ 取消原因
+
+
+
+
+ 是否取消
+
+
+
+
+ 是否可以评估
+
+
教育背景(Dto.View1)
@@ -22247,6 +22382,16 @@
修改信息
+
+
+ 性别
+
+
+
+
+ 关系
+
+
简历信息栏位(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 a40c11bd..8dbb5504 100644
--- a/Tiobon.Core.Model/View/Ghrh/Ghrh_Resume.Dto.View.cs
+++ b/Tiobon.Core.Model/View/Ghrh/Ghrh_Resume.Dto.View.cs
@@ -31,42 +31,142 @@ public class Ghrh_ResumeDto : Ghrh_Resume
/// 修改信息
///
public string UpdateDataInfo { get; set; }
+
+ ///
+ /// 职位
+ ///
public string TitleName { get; set; }
+
+ ///
+ /// 职位
+ ///
public string TitleLabel { get; set; }
-
+
+ ///
+ /// 性别
+ ///
public string GenderLabel { get; set; }
+
+ ///
+ /// 雪梨
+ ///
public string EducationLabel { get; set; }
+
+ ///
+ /// 民族
+ ///
public string NationLabel { get; set; }
+ ///
+ /// 婚姻状况
+ ///
+
public string MaritalStatusLabel { get; set; }
+
+ ///
+ /// 政治面貌
+ ///
public string PoliticStatusLabel { get; set; }
-
+
+ ///
+ /// 证照类型
+ ///
public string CertificateTypeLabel { get; set; }
+
+ ///
+ /// 户口性质
+ ///
public string RegisteredTypeLabel { get; set; }
public string UrgentRelationLabel { get; set; }
+ ///
+ /// 求职状态
+ ///
+ public string ApplyStatusLabel { get; set; }
+
+ ///
+ /// 标签
+ ///
public List TagList { get; set; }
+
+ ///
+ /// 标签
+ ///
public List TagIds { get; set; }
+
+ ///
+ /// 标签
+ ///
+ public string TagString { get; set; }
+
+ ///
+ /// 教育背景
+ ///
public List EduBG { get; set; }
+
+ ///
+ /// 工作经历
+ ///
public List WorkExp { get; set; }
-
+ ///
+ /// 简历ID
+ ///
public long? ResumeId { get; set; }
+
+ ///
+ /// 面试单号
+ ///
public string OrderNo { get; set; }
+
+ ///
+ /// 推荐时间
+ ///
public DateTime? RecommendTime { get; set; }
-
+
+ ///
+ /// 轮数，初试/复试或者一轮二轮三轮
+ ///
public int? Round { get; set; }
+
+ ///
+ /// 是否通过
+ ///
public bool? IsPass { get; set; }
-
- public string InterviewResult { get; set; }
+ ///
+ /// 面试结果
+ ///
+
+ public string InterviewResult { get; set; }
+ ///
+ /// 是否通过
+ ///
public string IsPassLabel { get; set; }
+ ///
+ /// 订单状态
+ ///
public string OrderStatus { get; set; }
-
+
+ ///
+ /// 员工ID
+ ///
public int? StaffId { get; set; }
+
+ ///
+ /// 取消原因
+ ///
public string CancelReason { get; set; }
+
+ ///
+ /// 是否取消
+ ///
public bool? IsCancel { get; set; }
+
+ ///
+ /// 是否可以评估
+ ///
public bool? IsAllowAssess { get; set; }
diff --git a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs
index aa2813e0..05db2cba 100644
--- a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs
+++ b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs
@@ -244,6 +244,7 @@ public class Ghrh_ResumeServices : BaseServices x.Id == o.ResumeId).ToList();
x.WorkExp = workExps.Where(o => x.Id == o.ResumeId).ToList();
@@ -252,7 +253,9 @@ public class Ghrh_ResumeServices : BaseServices>(x.Tags);
x.TagIds = tagIds1;
x.TagList = tags.Where(o => tagIds1.Contains(o.Id)).Select(o => o.TagName).ToList();
+ x.TagString = string.Join(",", x.TagList);
}
+ x.WorkYears = x.WorkYears ?? 0;
#region 计算年龄
if (x.Birthday != null && x.Birthday > DateTime.MinValue)
@@ -321,7 +324,7 @@ public class Ghrh_ResumeServices : BaseServices x.Id == o.ResumeId).ToList();
x.WorkExp = workExps.Where(o => x.Id == o.ResumeId).ToList();
if (x.Tags.IsNotEmptyOrNull())
@@ -2235,7 +2238,7 @@ WHERE A.IsEnable = 1 AND C.IsEnable = 1";
{
var dt = Db.GetDate().AddDays(-30);
- var list = await base.Query(x => x.Status == "Recycled" && x.RecycledTime <= dt);
+ var list = await base.Query(x => x.Status == "Recycled" && x.RecycledTime <= dt);
var ids = list.Select(x => x.Id).ToList();
if (ids.Any())
await Db.Updateable()