From 0e9a22e3b739b7037abb11101db65e90e3011319 Mon Sep 17 00:00:00 2001 From: xiaochanghai Date: Thu, 24 Oct 2024 09:12:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=AE=80=E5=8E=86=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=20=E6=96=B0=E5=A2=9E=E8=BF=94=E5=9B=9E=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Ghrh/Ghrh_ResumeController.cs | 2 +- Tiobon.Core.Api/Tiobon.Core.Model.xml | 2 ++ .../View/Ghrh/Ghrh_Resume.Dto.View.cs | 2 ++ .../View/Ghrh/Ghrh_ResumeEduBG.Dto.View.cs | 24 ++++++++++++------- .../View/Ghrh/Ghrh_ResumeWorkExp.Dto.View.cs | 23 +++++++++++------- .../Ghrh/Ghrh_ResumeServices.cs | 14 ++++++++++- Tiobon.Core/Tiobon.Core.Model.xml | 2 ++ 7 files changed, 49 insertions(+), 20 deletions(-) diff --git a/Tiobon.Core.Api/Controllers/Ghrh/Ghrh_ResumeController.cs b/Tiobon.Core.Api/Controllers/Ghrh/Ghrh_ResumeController.cs index 9bb0da94..dff909d9 100644 --- a/Tiobon.Core.Api/Controllers/Ghrh/Ghrh_ResumeController.cs +++ b/Tiobon.Core.Api/Controllers/Ghrh/Ghrh_ResumeController.cs @@ -73,7 +73,7 @@ public class Ghrh_ResumeController : BaseController Recovery([FromBody] List ids) { - bool result = await _service.DeleteById1(ids); + bool result = await _service.UpdateStatus(ids, "Recycled"); if (result) return ServiceResult.OprateSuccess("回收成功！"); return ServiceResult.OprateFailed("回收失败！"); diff --git a/Tiobon.Core.Api/Tiobon.Core.Model.xml b/Tiobon.Core.Api/Tiobon.Core.Model.xml index 46b64f36..198e39dd 100644 --- a/Tiobon.Core.Api/Tiobon.Core.Model.xml +++ b/Tiobon.Core.Api/Tiobon.Core.Model.xml @@ -18532,6 +18532,7 @@ 修改信息 + 简历信息栏位(Dto.View1) @@ -18592,6 +18593,7 @@ 修改信息 + Ghro_Dept(Dto.View) 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 ce72a533..feee2882 100644 --- a/Tiobon.Core.Model/View/Ghrh/Ghrh_Resume.Dto.View.cs +++ b/Tiobon.Core.Model/View/Ghrh/Ghrh_Resume.Dto.View.cs @@ -39,6 +39,8 @@ public class Ghrh_ResumeDto : Ghrh_Resume public string MaritalStatusLabel { get; set; } public string PoliticStatusLabel { get; set; } public string UrgentRelationLabel { get; set; } + + public List TagList { get; set; } public List EduBG { get; set; } public List WorkExp { get; set; } diff --git a/Tiobon.Core.Model/View/Ghrh/Ghrh_ResumeEduBG.Dto.View.cs b/Tiobon.Core.Model/View/Ghrh/Ghrh_ResumeEduBG.Dto.View.cs index 0e3a689f..e004672a 100644 --- a/Tiobon.Core.Model/View/Ghrh/Ghrh_ResumeEduBG.Dto.View.cs +++ b/Tiobon.Core.Model/View/Ghrh/Ghrh_ResumeEduBG.Dto.View.cs @@ -13,7 +13,7 @@ *│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ *│　作者：SimonHsiao │ *└──────────────────────────────────┘ -*/ +*/ namespace Tiobon.Core.Model.Models; @@ -22,13 +22,19 @@ namespace Tiobon.Core.Model.Models; /// public class Ghrh_ResumeEduBGDto : Ghrh_ResumeEduBG { -/// -/// 创建信息 -/// -public string CreateDataInfo { get; set; } + /// + /// 创建信息 + /// + public string CreateDataInfo { get; set; } -/// -/// 修改信息 -/// -public string UpdateDataInfo { get; set; } + /// + /// 修改信息 + /// + public string UpdateDataInfo { get; set; } + public string DegreeLevelLabel { get; set; } + + public string BeginDate1 { get; set; } + + /// + public string EndDate1 { get; set; } } diff --git a/Tiobon.Core.Model/View/Ghrh/Ghrh_ResumeWorkExp.Dto.View.cs b/Tiobon.Core.Model/View/Ghrh/Ghrh_ResumeWorkExp.Dto.View.cs index bcffdfd1..984e8b05 100644 --- a/Tiobon.Core.Model/View/Ghrh/Ghrh_ResumeWorkExp.Dto.View.cs +++ b/Tiobon.Core.Model/View/Ghrh/Ghrh_ResumeWorkExp.Dto.View.cs @@ -13,7 +13,7 @@ *│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ *│　作者：SimonHsiao │ *└──────────────────────────────────┘ -*/ +*/ namespace Tiobon.Core.Model.Models; @@ -22,13 +22,18 @@ namespace Tiobon.Core.Model.Models; /// public class Ghrh_ResumeWorkExpDto : Ghrh_ResumeWorkExp { -/// -/// 创建信息 -/// -public string CreateDataInfo { get; set; } + /// + /// 创建信息 + /// + public string CreateDataInfo { get; set; } -/// -/// 修改信息 -/// -public string UpdateDataInfo { get; set; } + /// + /// 修改信息 + /// + public string UpdateDataInfo { get; set; } + + public string BeginDate1 { get; set; } + + /// + public string EndDate1 { get; set; } } diff --git a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs index 295c1983..eb5c610d 100644 --- a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs +++ b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs @@ -42,7 +42,17 @@ public class Ghrh_ResumeServices : BaseServices().Where(x => x.TitleID != null && titleIds.Contains(x.TitleID.Value)).ToListAsync(); var eduBGs = await _ghre_ResumeEduBGServices.QueryDto(x => x.ResumeId != null && ids.Contains(x.ResumeId.Value)); var workExps = await _ghre_ResumeWorkExpServices.QueryDto(x => x.ResumeId != null && ids.Contains(x.ResumeId.Value)); - + eduBGs.ForEach(async x => + { + x.DegreeLevelLabel = await GetParaLabel("EducationalBGLevel", x.DegreeLevel); + x.BeginDate1 = DateTimeHelper.ConvertToDayString(x.BeginDate); + x.EndDate1 = DateTimeHelper.ConvertToDayString(x.EndDate); + }); + workExps.ForEach(x => + { + x.BeginDate1 = DateTimeHelper.ConvertToDayString(x.BeginDate); + x.EndDate1 = DateTimeHelper.ConvertToDayString(x.EndDate); + }); list.ForEach(async x => { if (x.TitleId != null) x.TitleName = titles.Where(o => o.TitleID == x.TitleId).FirstOrDefault()?.TitleName; @@ -55,6 +65,8 @@ public class Ghrh_ResumeServices : BaseServices x.Id == o.ResumeId).ToList(); x.WorkExp = workExps.Where(o => x.Id == o.ResumeId).ToList(); + if (x.Tags.IsNotEmptyOrNull()) + x.TagList = JsonHelper.JsonToObj>(x.Tags); }); return result; diff --git a/Tiobon.Core/Tiobon.Core.Model.xml b/Tiobon.Core/Tiobon.Core.Model.xml index 46b64f36..198e39dd 100644 --- a/Tiobon.Core/Tiobon.Core.Model.xml +++ b/Tiobon.Core/Tiobon.Core.Model.xml @@ -18532,6 +18532,7 @@ 修改信息 + 简历信息栏位(Dto.View1) @@ -18592,6 +18593,7 @@ 修改信息 + Ghro_Dept(Dto.View)