From 4461ae29d308ca9e665d0a6c4deb3af45cd3cf44 Mon Sep 17 00:00:00 2001 From: xiaochanghai Date: Fri, 6 Dec 2024 11:47:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Ghrh/Ghrh_OfferApplyOrderController.cs | 11 +++ Tiobon.Core.Api/Tiobon.Core.Model.xml | 5 ++ Tiobon.Core.Api/Tiobon.Core.xml | 7 ++ .../Ghrh/IGhrh_OfferApplyOrderServices.cs | 2 + .../View/Ghrh/Ghrh_Resume.Dto.View.cs | 8 ++ Tiobon.Core.Services/CommonServices.cs | 2 +- .../Ghrh/Ghrh_OfferApplyOrderServices.cs | 83 ++++++++++++++++++- .../Ghrh/Ghrh_ResumeServices.cs | 21 ++++- Tiobon.Core/Tiobon.Core.Model.xml | 5 ++ Tiobon.Core/Tiobon.Core.xml | 7 ++ 10 files changed, 146 insertions(+), 5 deletions(-) diff --git a/Tiobon.Core.Api/Controllers/Ghrh/Ghrh_OfferApplyOrderController.cs b/Tiobon.Core.Api/Controllers/Ghrh/Ghrh_OfferApplyOrderController.cs index a51a4ff6..6ca7a778 100644 --- a/Tiobon.Core.Api/Controllers/Ghrh/Ghrh_OfferApplyOrderController.cs +++ b/Tiobon.Core.Api/Controllers/Ghrh/Ghrh_OfferApplyOrderController.cs @@ -11,4 +11,15 @@ public class Ghrh_OfferApplyOrderController : BaseController + /// 查询简历 + /// + /// 简历ID + /// + [HttpPost, Route("QueryResume/{id}")] + public async Task> QueryResume(long id) => await _service.QueryResume(id); + + #endregion } \ No newline at end of file diff --git a/Tiobon.Core.Api/Tiobon.Core.Model.xml b/Tiobon.Core.Api/Tiobon.Core.Model.xml index 264a565c..1630a669 100644 --- a/Tiobon.Core.Api/Tiobon.Core.Model.xml +++ b/Tiobon.Core.Api/Tiobon.Core.Model.xml @@ -25152,6 +25152,11 @@ 审批类型，线上审批or不走审批 + + + 已报到转入人事资料类型，Fast,快速入职;Normal,正常入职 + + 教育背景(Dto.View1) diff --git a/Tiobon.Core.Api/Tiobon.Core.xml b/Tiobon.Core.Api/Tiobon.Core.xml index 292130fc..2d1fac9a 100644 --- a/Tiobon.Core.Api/Tiobon.Core.xml +++ b/Tiobon.Core.Api/Tiobon.Core.xml @@ -1285,6 +1285,13 @@ 录用审批单(Controller) + + + 查询简历 + + 简历ID + + 录用审批单薪资(Controller) diff --git a/Tiobon.Core.IServices/Ghrh/IGhrh_OfferApplyOrderServices.cs b/Tiobon.Core.IServices/Ghrh/IGhrh_OfferApplyOrderServices.cs index 6cc7e480..ca55c150 100644 --- a/Tiobon.Core.IServices/Ghrh/IGhrh_OfferApplyOrderServices.cs +++ b/Tiobon.Core.IServices/Ghrh/IGhrh_OfferApplyOrderServices.cs @@ -1,4 +1,5 @@ using Tiobon.Core.IServices.BASE; +using Tiobon.Core.Model; using Tiobon.Core.Model.Models; namespace Tiobon.Core.IServices; @@ -8,4 +9,5 @@ namespace Tiobon.Core.IServices; /// public interface IGhrh_OfferApplyOrderServices : IBaseServices { + Task> QueryResume(long resumeId); } \ No newline at end of file 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 b1f4ce2a..54822702 100644 --- a/Tiobon.Core.Model/View/Ghrh/Ghrh_Resume.Dto.View.cs +++ b/Tiobon.Core.Model/View/Ghrh/Ghrh_Resume.Dto.View.cs @@ -231,4 +231,12 @@ public class Ghrh_ResumeDto : Ghrh_Resume /// 审批类型，线上审批or不走审批 /// public string OfferApplyType { get; set; } + + /// + /// 已报到转入人事资料类型，Fast,快速入职;Normal,正常入职 + /// + public string TransferStaffType { get; set; } + + + } diff --git a/Tiobon.Core.Services/CommonServices.cs b/Tiobon.Core.Services/CommonServices.cs index c16eb74a..12fbcb94 100644 --- a/Tiobon.Core.Services/CommonServices.cs +++ b/Tiobon.Core.Services/CommonServices.cs @@ -1412,7 +1412,7 @@ public partial class CommonServices : BaseServices>, ICommon result.JM_PageControlT1.Toolbar.Add(new Toolbar() { display = true, - fnKey = "TBD25YN", + fnKey = "TBD26YN", fnTitle = "转入待发offer", fnType = "row", icon = "ess-icon-reject", diff --git a/Tiobon.Core.Services/Ghrh/Ghrh_OfferApplyOrderServices.cs b/Tiobon.Core.Services/Ghrh/Ghrh_OfferApplyOrderServices.cs index 61d3b6e3..1862afc4 100644 --- a/Tiobon.Core.Services/Ghrh/Ghrh_OfferApplyOrderServices.cs +++ b/Tiobon.Core.Services/Ghrh/Ghrh_OfferApplyOrderServices.cs @@ -1,4 +1,7 @@ -namespace Tiobon.Core.Services; +using System.Threading.Channels; +using Tiobon.Core.IServices; + +namespace Tiobon.Core.Services; /// /// 录用审批单 (服务) @@ -112,7 +115,7 @@ public class Ghrh_OfferApplyOrderServices : BaseServices> QueryResume(long resumeId) + { + dynamic obj = new ExpandoObject(); + + var resume = await Db.Queryable().Where(x => x.Id == resumeId).FirstAsync(); + + if (resume == null) + return ServiceResult.OprateFailed("无效的简历ID", obj); + obj.StaffName = resume.StaffName; + obj.IdCardNo = resume.IdCardNo; + obj.ResumeId = resume.Id; + obj.Channel = resume.Channel; + var order = await Db.Queryable().Where(x => x.ResumeId == resumeId).FirstAsync(); + if (order != null) + { + var columns = new JArray(); + + obj.TitleId = order.HireTitleId; + obj.DeptId = order.HireDeptId; + obj.IdCardNo = resume.IdCardNo; + var records = await Db.Queryable().Where(x => x.OrderId == order.Id).OrderBy(x => x.Round).ToListAsync(); + var recordIds = records.Select(x => x.Id).ToList(); + var interviewAssessDetails = await Db.Queryable().Where(x => x.InterviewRecordId != null && recordIds.Contains(x.InterviewRecordId.Value)).ToListAsync(); + + + for (int i = 0; i < records.Count; i++) + { + var record = records[i]; + + var staff = await Db.Queryable().Where(x => x.StaffID == record.StaffId).FirstAsync(); + var evaluate = interviewAssessDetails.Where(x => x.InterviewRecordId == record.Id && x.AssessConfigId == "EvaluateContent").FirstOrDefault(); + var pass = interviewAssessDetails.Where(x => x.InterviewRecordId == record.Id && x.AssessConfigId == "IsPass").FirstOrDefault(); + + var item = new JObject + { + new JProperty("Round", NumberToChinese(record.Round.Value)+"面\n"+ record.InterviewTime), + new JProperty("Interviewer", staff?.StaffName), + }; + if (evaluate != null) + item.Add(new JProperty("EvaluateContent", evaluate.AssessContent)); + if (pass != null) + { + if (pass.AssessContent == "1") + item.Add(new JProperty("PassLabel", "通过")); + else + item.Add(new JProperty("PassLabel", "不通过")); + } + + columns.Add(item); + + } + + obj.InterviewRecord = columns; + } + + return ServiceResult.OprateSuccess("查询成功", obj); + + } + #endregion } \ No newline at end of file diff --git a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs index 8844f6b6..f81e962e 100644 --- a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs +++ b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs @@ -288,7 +288,10 @@ public class Ghrh_ResumeServices : BaseServices tagIds.Contains(x.Id)); #region 查询审批流程状态 - var config = await Db.Queryable().Where(x => x.ConfigCode == "ESS_Recruit_Custom_Offer_Apply").FirstAsync(); + //【面试过程 - 已面试 - 发起录用审批】配置按钮 + var offerApplyConfig = await Db.Queryable().Where(x => x.ConfigCode == "ESS_Recruit_Custom_Offer_Apply").FirstAsync(); + //【简历库-录用-已发offer】配置按钮 + var sendOfferConfig = await Db.Queryable().Where(x => x.ConfigCode == "ESS_Recruit_Custom_Transfer_Staff").FirstAsync(); #endregion list.ForEach(async x => @@ -341,7 +344,12 @@ public class Ghrh_ResumeServices : BaseServices().Where(x => x.ConfigCode == "ESS_Recruit_Custom_Transfer_Staff").FirstAsync(); + //if (entity.Status != DIC_INTERVIEW_ORDER_STATUS.HasSendOffer) // return ServiceResult.OprateFailed("非【已发offer】状态下简历不可发送提醒！"); @@ -2021,6 +2032,12 @@ END"; order.Status = DIC_INTERVIEW_ORDER_STATUS.HasOffer; records.ForEach(record => record.Status = DIC_INTERVIEW_ORDER_STATUS.HasOffer); } + else + { + entity.Status = DIC_INTERVIEW_ORDER_STATUS.HasSendOffer; + order.Status = DIC_INTERVIEW_ORDER_STATUS.HasSendOffer; + records.ForEach(record => record.Status = DIC_INTERVIEW_ORDER_STATUS.HasSendOffer); + } await Update(entity, ["Status"]); await _ghrh_InterviewOrderServices.Update(order, ["Status"]); diff --git a/Tiobon.Core/Tiobon.Core.Model.xml b/Tiobon.Core/Tiobon.Core.Model.xml index 264a565c..1630a669 100644 --- a/Tiobon.Core/Tiobon.Core.Model.xml +++ b/Tiobon.Core/Tiobon.Core.Model.xml @@ -25152,6 +25152,11 @@ 审批类型，线上审批or不走审批 + + + 已报到转入人事资料类型，Fast,快速入职;Normal,正常入职 + + 教育背景(Dto.View1) diff --git a/Tiobon.Core/Tiobon.Core.xml b/Tiobon.Core/Tiobon.Core.xml index 292130fc..2d1fac9a 100644 --- a/Tiobon.Core/Tiobon.Core.xml +++ b/Tiobon.Core/Tiobon.Core.xml @@ -1285,6 +1285,13 @@ 录用审批单(Controller) + + + 查询简历 + + 简历ID + + 录用审批单薪资(Controller)