From 57d0838afe4c32ce92c4862733cd93e71fe680e9 Mon Sep 17 00:00:00 2001 From: xiaochanghai Date: Wed, 20 Nov 2024 10:21:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=89=B9=E9=87=8F=E7=AE=80?= =?UTF-8?q?=E5=8E=86=E6=8E=A8=E8=8D=90=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Ghrh/Ghrh_ResumeController.cs | 18 ++---- Tiobon.Core.Api/Tiobon.Core.Model.xml | 25 +++++++++ Tiobon.Core.Api/Tiobon.Core.xml | 11 +--- .../Ghrh/IGhrh_ResumeServices.cs | 2 +- .../Base/Ghrh/Ghrh_InterviewOrder.Dto.Base.cs | 6 ++ .../Models/Ghrh/Ghrh_InterviewOrder.cs | 6 ++ .../ViewModels/Extend/ResumeViewTab.cs | 17 +++++- .../Ghrh/Ghrh_ResumeServices.cs | 54 ++++++++++-------- Tiobon.Core/Tiobon.Core.Model.xml | 55 +++++++++---------- Tiobon.Core/Tiobon.Core.xml | 11 +--- 10 files changed, 117 insertions(+), 88 deletions(-) diff --git a/Tiobon.Core.Api/Controllers/Ghrh/Ghrh_ResumeController.cs b/Tiobon.Core.Api/Controllers/Ghrh/Ghrh_ResumeController.cs index a7a9b99e..635f5cbe 100644 --- a/Tiobon.Core.Api/Controllers/Ghrh/Ghrh_ResumeController.cs +++ b/Tiobon.Core.Api/Controllers/Ghrh/Ghrh_ResumeController.cs @@ -65,15 +65,6 @@ public class Ghrh_ResumeController : BaseController>> QueryConditions() => await _service.QueryConditions(); #endregion - #region 推荐简历 - /// - /// 推荐简历 - /// - /// - [HttpPost("Recommend")] - public async Task Recommend([FromBody] List ids) => await _service.SwitchIsRecommend(ids, true); - #endregion - #region 取消推荐简历 /// /// 取消推荐简历 @@ -223,13 +214,12 @@ public class Ghrh_ResumeController : BaseController /// 推荐 /// - /// 信息 - /// 简历Id + /// 信息 /// - [HttpPost, Route("Recommend/{id}")] - public async Task Recommend([FromBody] ResumeRecommendForm body, long id) + [HttpPost, Route("Recommend")] + public async Task Recommend([FromBody] ResumeRecommendForm body) { - return await _service.Recommend(id, body); + return await _service.Recommend(body); } #endregion diff --git a/Tiobon.Core.Api/Tiobon.Core.Model.xml b/Tiobon.Core.Api/Tiobon.Core.Model.xml index 81175d11..16d4a318 100644 --- a/Tiobon.Core.Api/Tiobon.Core.Model.xml +++ b/Tiobon.Core.Api/Tiobon.Core.Model.xml @@ -6285,6 +6285,11 @@ 推荐人ID + + + 推荐说明 + + 面试开始时间 @@ -16906,6 +16911,11 @@ 推荐人ID + + + 推荐说明 + + 面试开始时间 @@ -22987,11 +22997,26 @@ 人力需求维护ID + + + 简历ID列表 + + 面试官列表 + + + 推荐说明 + + + + + 附件 + + 人力需求维护ID diff --git a/Tiobon.Core.Api/Tiobon.Core.xml b/Tiobon.Core.Api/Tiobon.Core.xml index e6b89393..5dc8a343 100644 --- a/Tiobon.Core.Api/Tiobon.Core.xml +++ b/Tiobon.Core.Api/Tiobon.Core.xml @@ -1272,12 +1272,6 @@ - - - 推荐简历 - - - 取消推荐简历 @@ -1349,12 +1343,11 @@ status - + 推荐 - 信息 - 简历Id + 信息 diff --git a/Tiobon.Core.IServices/Ghrh/IGhrh_ResumeServices.cs b/Tiobon.Core.IServices/Ghrh/IGhrh_ResumeServices.cs index 5274c320..de0ff4ea 100644 --- a/Tiobon.Core.IServices/Ghrh/IGhrh_ResumeServices.cs +++ b/Tiobon.Core.IServices/Ghrh/IGhrh_ResumeServices.cs @@ -33,7 +33,7 @@ public interface IGhrh_ResumeServices : IBaseServices> Export(QueryBody filter, string condition, bool? IsEnable = true); - Task Recommend(long id, ResumeRecommendForm recommend); + Task Recommend(ResumeRecommendForm recommend); Task RemindHasRecommend(long id); diff --git a/Tiobon.Core.Model/Base/Ghrh/Ghrh_InterviewOrder.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghrh/Ghrh_InterviewOrder.Dto.Base.cs index cab8af51..91da3769 100644 --- a/Tiobon.Core.Model/Base/Ghrh/Ghrh_InterviewOrder.Dto.Base.cs +++ b/Tiobon.Core.Model/Base/Ghrh/Ghrh_InterviewOrder.Dto.Base.cs @@ -54,6 +54,12 @@ public class Ghrh_InterviewOrderBase /// public long? RecommendId { get; set; } + /// + /// 推荐说明 + /// + [Display(Name = "RecommendRemark"), Description("推荐说明"), MaxLength(256, ErrorMessage = "推荐说明 不能超过 256 个字符")] + public string RecommendRemark { get; set; } + /// /// 面试开始时间 /// diff --git a/Tiobon.Core.Model/Models/Ghrh/Ghrh_InterviewOrder.cs b/Tiobon.Core.Model/Models/Ghrh/Ghrh_InterviewOrder.cs index cb93779d..b5f48b9a 100644 --- a/Tiobon.Core.Model/Models/Ghrh/Ghrh_InterviewOrder.cs +++ b/Tiobon.Core.Model/Models/Ghrh/Ghrh_InterviewOrder.cs @@ -55,6 +55,12 @@ public class Ghrh_InterviewOrder : BasePoco /// public long? RecommendId { get; set; } + /// + /// 推荐说明 + /// + [Display(Name = "RecommendRemark"), Description("推荐说明"), MaxLength(256, ErrorMessage = "推荐说明 不能超过 256 个字符")] + public string RecommendRemark { get; set; } + /// /// 面试开始时间 /// diff --git a/Tiobon.Core.Model/ViewModels/Extend/ResumeViewTab.cs b/Tiobon.Core.Model/ViewModels/Extend/ResumeViewTab.cs index c862e976..5f19f8f1 100644 --- a/Tiobon.Core.Model/ViewModels/Extend/ResumeViewTab.cs +++ b/Tiobon.Core.Model/ViewModels/Extend/ResumeViewTab.cs @@ -71,10 +71,25 @@ public class ResumeRecommendForm /// public long RequestId { get; set; } + /// + /// 简历ID列表 + /// + public List ids { get; set; } + /// /// 面试官列表 /// public List InterviewStaffs { get; set; } + + /// + /// 推荐说明 + /// + public string RecommendRemark { get; set; } + + /// + /// 附件 + /// + public List Attachments { get; set; } } public class ResumeScheduleInterviewForm @@ -119,7 +134,7 @@ public class ResumeRescheduleInterviewForm1 public List InterviewStaffs { get; set; } } -public class ResumeAssessInterviewForm +public class ResumeAssessInterviewForm { /// /// 是否通过 diff --git a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs index 7d5ac705..c128647a 100644 --- a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs +++ b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs @@ -1235,37 +1235,43 @@ END"; #endregion #region 简历推荐 - public async Task Recommend(long id, ResumeRecommendForm recommend) + public async Task Recommend(ResumeRecommendForm recommend) { - if (await AnyAsync(x => x.Status == DIC_INTERVIEW_ORDER_STATUS.HasRecommended || - x.Status == DIC_INTERVIEW_ORDER_STATUS.HasRecommended || - x.Status == DIC_INTERVIEW_ORDER_STATUS.WaitAppointment || - x.Status == DIC_INTERVIEW_ORDER_STATUS.WaitInterview || - x.Status == DIC_INTERVIEW_ORDER_STATUS.HasInterview)) - return ServiceResult.OprateFailed("简历正推荐中，不可重复推荐！"); - await Db.Updateable() - .SetColumns(it => it.IsEnable == 0) - .Where(it => it.ResumeId == id) - .ExecuteCommandAsync(); - var orderId = await _ghrh_InterviewOrderServices.Add(new InsertGhrh_InterviewOrderInput() + for (int m = 0; m < recommend.ids.Count; m++) { - ResumeId = id, - RequestId = recommend.RequestId, - RecommendTime = DateTime.Now, - RecommendId = App.User.ID, - Round = 1, - OrderNo = await GenerateContinuousSequence("Ghrh_InterviewOrder", "OrderNo", "V"), - Status = DIC_INTERVIEW_ORDER_STATUS.HasRecommended - }); - for (int i = 0; i < recommend.InterviewStaffs.Count; i++) - await _ghrh_InterviewRecordServices.Add(new InsertGhrh_InterviewRecordInput() + var id = recommend.ids[m]; + if (await AnyAsync(x => x.Status == DIC_INTERVIEW_ORDER_STATUS.HasRecommended || + x.Status == DIC_INTERVIEW_ORDER_STATUS.HasRecommended || + x.Status == DIC_INTERVIEW_ORDER_STATUS.WaitAppointment || + x.Status == DIC_INTERVIEW_ORDER_STATUS.WaitInterview || + x.Status == DIC_INTERVIEW_ORDER_STATUS.HasInterview)) + continue; + await Db.Updateable() + .SetColumns(it => it.IsEnable == 0) + .Where(it => it.ResumeId == id) + .ExecuteCommandAsync(); + + var orderId = await _ghrh_InterviewOrderServices.Add(new InsertGhrh_InterviewOrderInput() { - OrderId = orderId, + ResumeId = id, + RequestId = recommend.RequestId, + RecommendTime = DateTime.Now, + RecommendId = App.User.ID, Round = 1, + OrderNo = await GenerateContinuousSequence("Ghrh_InterviewOrder", "OrderNo", "V"), Status = DIC_INTERVIEW_ORDER_STATUS.HasRecommended, - StaffId = recommend.InterviewStaffs[i].StaffId, + RecommendRemark = recommend.RecommendRemark }); + for (int i = 0; i < recommend.InterviewStaffs.Count; i++) + await _ghrh_InterviewRecordServices.Add(new InsertGhrh_InterviewRecordInput() + { + OrderId = orderId, + Round = 1, + Status = DIC_INTERVIEW_ORDER_STATUS.HasRecommended, + StaffId = recommend.InterviewStaffs[i].StaffId, + }); + } return ServiceResult.OprateSuccess(); } diff --git a/Tiobon.Core/Tiobon.Core.Model.xml b/Tiobon.Core/Tiobon.Core.Model.xml index b65f50d2..16d4a318 100644 --- a/Tiobon.Core/Tiobon.Core.Model.xml +++ b/Tiobon.Core/Tiobon.Core.Model.xml @@ -6285,6 +6285,11 @@ 推荐人ID + + + 推荐说明 + + 面试开始时间 @@ -16906,6 +16911,11 @@ 推荐人ID + + + 推荐说明 + + 面试开始时间 @@ -21847,36 +21857,6 @@ 修改信息 - - - 订单号 - - - - - 推荐时间 - - - - - 轮数 - - - - - 是否通过 - - - - - 订单状态 - - - - - 员工ID - - 教育背景(Dto.View1) @@ -23017,11 +22997,26 @@ 人力需求维护ID + + + 简历ID列表 + + 面试官列表 + + + 推荐说明 + + + + + 附件 + + 人力需求维护ID diff --git a/Tiobon.Core/Tiobon.Core.xml b/Tiobon.Core/Tiobon.Core.xml index e6b89393..5dc8a343 100644 --- a/Tiobon.Core/Tiobon.Core.xml +++ b/Tiobon.Core/Tiobon.Core.xml @@ -1272,12 +1272,6 @@ - - - 推荐简历 - - - 取消推荐简历 @@ -1349,12 +1343,11 @@ status - + 推荐 - 信息 - 简历Id + 信息