diff --git a/Model/Tiobon.Web.pdm b/Model/Tiobon.Web.pdm index 16499908..bfd307bf 100644 --- a/Model/Tiobon.Web.pdm +++ b/Model/Tiobon.Web.pdm @@ -1,5 +1,5 @@ - + @@ -33632,10 +33632,10 @@ Ghra_staff_InsureBase 59CE09CB-F39A-4697-A9B2-03AFF51BD824 求职状态 -求职状态 +ApplyStatus 1729495619 Administrator -1729496402 +1729560119 Administrator 求职状态 nvarchar(32) @@ -33643,15 +33643,14 @@ Ghra_staff_InsureBase 6EE8F4FC-212B-4A3E-942D-B953511FF226 -岗位 +岗位ID TitleId 1729218908 Administrator -1729495764 +1729561525 Administrator -岗位 -nvarchar(32) -32 +岗位ID +int 9109D0ED-971C-47D3-9F45-ABA569CC47D0 diff --git a/Tiobon.Core.Api/Tiobon.Core.Model.xml b/Tiobon.Core.Api/Tiobon.Core.Model.xml index 2f264bd7..24cd6c41 100644 --- a/Tiobon.Core.Api/Tiobon.Core.Model.xml +++ b/Tiobon.Core.Api/Tiobon.Core.Model.xml @@ -6020,14 +6020,14 @@ 毕业日期 - + 求职状态 - 岗位 + 岗位ID @@ -14691,14 +14691,14 @@ 毕业日期 - + 求职状态 - 岗位 + 岗位ID diff --git a/Tiobon.Core.Model/Base/Ghrh/Ghrh_Resume.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghrh/Ghrh_Resume.Dto.Base.cs index 1c94a514..9053627d 100644 --- a/Tiobon.Core.Model/Base/Ghrh/Ghrh_Resume.Dto.Base.cs +++ b/Tiobon.Core.Model/Base/Ghrh/Ghrh_Resume.Dto.Base.cs @@ -94,14 +94,14 @@ namespace Tiobon.Core.Model.Models /// /// 求职状态 /// - [Display(Name = "求职状态"), Description("求职状态"), MaxLength(32, ErrorMessage = "求职状态 不能超过 32 个字符")] - public string 求职状态 { get; set; } + [Display(Name = "ApplyStatus"), Description("求职状态"), MaxLength(32, ErrorMessage = "求职状态 不能超过 32 个字符")] + public string ApplyStatus { get; set; } /// - /// 岗位 + /// 岗位ID /// - [Display(Name = "TitleId"), Description("岗位"), MaxLength(32, ErrorMessage = "岗位 不能超过 32 个字符")] - public string TitleId { get; set; } + [Display(Name = "TitleId"), Description("岗位ID")] + public int? TitleId { get; set; } /// /// 婚姻状况 diff --git a/Tiobon.Core.Model/Models/Ghrh/Ghrh_Resume.cs b/Tiobon.Core.Model/Models/Ghrh/Ghrh_Resume.cs index 6a227297..d1a2de22 100644 --- a/Tiobon.Core.Model/Models/Ghrh/Ghrh_Resume.cs +++ b/Tiobon.Core.Model/Models/Ghrh/Ghrh_Resume.cs @@ -96,14 +96,14 @@ namespace Tiobon.Core.Model.Models /// /// 求职状态 /// - [Display(Name = "求职状态"), Description("求职状态"), MaxLength(32, ErrorMessage = "求职状态 不能超过 32 个字符")] - public string 求职状态 { get; set; } + [Display(Name = "ApplyStatus"), Description("求职状态"), MaxLength(32, ErrorMessage = "求职状态 不能超过 32 个字符")] + public string ApplyStatus { get; set; } /// - /// 岗位 + /// 岗位ID /// - [Display(Name = "TitleId"), Description("岗位"), MaxLength(32, ErrorMessage = "岗位 不能超过 32 个字符")] - public string TitleId { get; set; } + [Display(Name = "TitleId"), Description("岗位ID") ] + public int? TitleId { get; set; } /// /// 婚姻状况 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 e92539a4..f33c114c 100644 --- a/Tiobon.Core.Model/View/Ghrh/Ghrh_Resume.Dto.View.cs +++ b/Tiobon.Core.Model/View/Ghrh/Ghrh_Resume.Dto.View.cs @@ -13,7 +13,7 @@ *│ 此技术信息为本公司机密信息,未经本公司书面同意禁止向第三方披露. │ *│ 作者:SimonHsiao │ *└──────────────────────────────────┘ -*/ +*/ namespace Tiobon.Core.Model.Models; @@ -22,13 +22,22 @@ namespace Tiobon.Core.Model.Models; /// public class Ghrh_ResumeDto : Ghrh_Resume { -/// -/// 创建信息 -/// -public string CreateDataInfo { get; set; } + /// + /// 创建信息 + /// + public string CreateDataInfo { get; set; } + + /// + /// 修改信息 + /// + public string UpdateDataInfo { get; set; } + public string TitleName { 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 UrgentRelationLabel { get; set; } -/// -/// 修改信息 -/// -public string UpdateDataInfo { get; set; } } diff --git a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs index e51323c6..1b2b1523 100644 --- a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs +++ b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs @@ -8,7 +8,6 @@ using Tiobon.Core.Common; using Tiobon.Core.Model.ViewModels.Extend; using Tiobon.Core.Model; using Tiobon.Core.Common.Helper; -using System.Collections.Generic; namespace Tiobon.Core.Services; @@ -29,6 +28,22 @@ public class Ghrh_ResumeServices : BaseServices> QueryFilterPage(QueryBody filter, string condition, bool? IsEnable = true) { var result = await base.QueryFilterPage(filter, condition, IsEnable); + var list = result.result.DT_TableDataT1; + var ids = list.Select(x => x.Id).ToList(); + var titleIds = list.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(); + list.ForEach(async x => + { + if (x.TitleId != null) x.TitleName = titles.Where(o => o.TitleID == x.TitleId).FirstOrDefault()?.TitleName; + x.GenderLabel = await GetParaLabel("Gender", x.Gender); + x.EducationLabel = await GetParaLabel("EducationalBGLevel", x.Education); + x.NationLabel = await GetParaLabel("A02", x.Nation); + x.MaritalStatusLabel = await GetParaLabel("A03", x.MaritalStatus); + x.PoliticStatusLabel = await GetParaLabel("A04", x.PoliticStatus); + x.UrgentRelationLabel = await GetParaLabel("SocialRelationType", x.UrgentRelation); + }); + return result; } @@ -38,7 +53,7 @@ public class Ghrh_ResumeServices : BaseServices>(str); - return ServiceResult>.OprateSuccess("查询成功!", tabs); + return ServiceResult>.OprateSuccess("查询成功!", tabs); } #endregion