From f82c3dd6ecff61b890cb2381949d23e7dfd4c2ae Mon Sep 17 00:00:00 2001 From: xiaochanghai Date: Fri, 6 Dec 2024 10:17:38 +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 --- Tiobon.Core.Api/Tiobon.Core.Model.xml | 5 ++ .../View/Ghrh/Ghrh_Resume.Dto.View.cs | 5 ++ Tiobon.Core.Services/CommonServices.cs | 47 +++++++++++++++++++ .../Ghrh/Ghrh_OfferApplyOrderServices.cs | 39 +++++++++++++-- .../Ghrh/Ghrh_ResumeServices.cs | 8 ++++ Tiobon.Core/Tiobon.Core.Model.xml | 5 ++ 6 files changed, 106 insertions(+), 3 deletions(-) diff --git a/Tiobon.Core.Api/Tiobon.Core.Model.xml b/Tiobon.Core.Api/Tiobon.Core.Model.xml index 5b787a22..264a565c 100644 --- a/Tiobon.Core.Api/Tiobon.Core.Model.xml +++ b/Tiobon.Core.Api/Tiobon.Core.Model.xml @@ -25147,6 +25147,11 @@ 约面反馈 + + + 审批类型,线上审批or不走审批 + + 教育背景(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 4605d1fc..b1f4ce2a 100644 --- a/Tiobon.Core.Model/View/Ghrh/Ghrh_Resume.Dto.View.cs +++ b/Tiobon.Core.Model/View/Ghrh/Ghrh_Resume.Dto.View.cs @@ -226,4 +226,9 @@ public class Ghrh_ResumeDto : Ghrh_Resume /// 约面反馈 /// public string AppointmentFeedback { get; set; } + + /// + /// 审批类型,线上审批or不走审批 + /// + public string OfferApplyType { get; set; } } diff --git a/Tiobon.Core.Services/CommonServices.cs b/Tiobon.Core.Services/CommonServices.cs index 098cce08..c16eb74a 100644 --- a/Tiobon.Core.Services/CommonServices.cs +++ b/Tiobon.Core.Services/CommonServices.cs @@ -1369,6 +1369,16 @@ public partial class CommonServices : BaseServices>, ICommon position = "left" }); if (toolbarRoles.Where(x => x.RoleNo == "RecruitResumeScheduleInterview").Any()) + { + result.JM_PageControlT1.Toolbar.Add(new Toolbar() + { + display = true, + fnKey = "TBD13YN", + fnTitle = "安排面试", + fnType = "row", + icon = "ess-icon-reject", + position = "left" + }); result.JM_PageControlT1.Toolbar.Add(new Toolbar() { display = true, @@ -1378,6 +1388,7 @@ public partial class CommonServices : BaseServices>, ICommon icon = "ess-icon-reject", position = "left" }); + } if (toolbarRoles.Where(x => x.RoleNo == "RecruitResumeReScheduleInterview").Any()) result.JM_PageControlT1.Toolbar.Add(new Toolbar() { @@ -1398,6 +1409,15 @@ public partial class CommonServices : BaseServices>, ICommon icon = "ess-icon-reject", position = "left" }); + result.JM_PageControlT1.Toolbar.Add(new Toolbar() + { + display = true, + fnKey = "TBD25YN", + fnTitle = "转入待发offer", + fnType = "row", + icon = "ess-icon-reject", + position = "left" + }); } break; case "F_ResumeMaintenance_Hire"://录用 @@ -3745,6 +3765,33 @@ END"; } #endregion + break; + case "F_ESS_RecruitOfferApply": + + #region 写入数据,并判断是否有错误 + switch (param.doType) + { + case "Apply": + case "BatchApply": + + #region 写入数据,并判断是否有错误 + string json = param.jsonParam.ToString(); + var dict = JsonHelper.JsonToObj(json); + dict.RequestNo = await GenerateContinuousSequence("Ghrh_HumanRequest", "RequestNo", "R"); + id = await Db.Insertable(dict).ExecuteReturnSnowflakeIdAsync(); + + sql = $"SELECT ISNULL(MAX(id)+1,1) FROM Ghrh_HumanRequest WHERE Id !='{id}'"; + var id1 = await Db.Ado.GetLongAsync(sql); + sql = $"UPDATE Ghrh_HumanRequest SET Id={id1} WHERE Id ='{id}'"; + await Db.Ado.ExecuteCommandAsync(sql); + + id = id1; + #endregion + + break; + } + #endregion + break; } diff --git a/Tiobon.Core.Services/Ghrh/Ghrh_OfferApplyOrderServices.cs b/Tiobon.Core.Services/Ghrh/Ghrh_OfferApplyOrderServices.cs index bba90e0a..61d3b6e3 100644 --- a/Tiobon.Core.Services/Ghrh/Ghrh_OfferApplyOrderServices.cs +++ b/Tiobon.Core.Services/Ghrh/Ghrh_OfferApplyOrderServices.cs @@ -1,6 +1,4 @@ -using Microsoft.IdentityModel.Tokens; - -namespace Tiobon.Core.Services; +namespace Tiobon.Core.Services; /// /// 录用审批单 (服务) @@ -111,6 +109,14 @@ public class Ghrh_OfferApplyOrderServices : BaseServices @@ -119,6 +125,33 @@ public class Ghrh_OfferApplyOrderServices : BaseServices tagIds.Contains(x.Id)); + #region 查询审批流程状态 + var config = await Db.Queryable().Where(x => x.ConfigCode == "ESS_Recruit_Custom_Offer_Apply").FirstAsync(); + #endregion list.ForEach(async x => { @@ -335,6 +338,11 @@ public class Ghrh_ResumeServices : BaseServices + + + 审批类型,线上审批or不走审批 + + 教育背景(Dto.View1)