优化

Tiobon.Core.Api/Tiobon.Core.Model.xml

@@ -25147,6 +25147,11 @@
             约面反馈
             </summary> 
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghrh_ResumeDto.OfferApplyType">
+            <summary>
+            审批类型，线上审批or不走审批
+            </summary> 
+        </member>
         <member name="T:Tiobon.Core.Model.Models.Ghrh_ResumeEduBGDto">
             <summary>
             教育背景(Dto.View1)

Tiobon.Core.Model/View/Ghrh/Ghrh_Resume.Dto.View.cs

@@ -226,4 +226,9 @@ public class Ghrh_ResumeDto : Ghrh_Resume
     /// 约面反馈
     /// </summary> 
     public string AppointmentFeedback { get; set; }
+
+    /// <summary>
+    /// 审批类型，线上审批or不走审批
+    /// </summary> 
+    public string OfferApplyType { get; set; }
 }

Tiobon.Core.Services/CommonServices.cs

@@ -1369,6 +1369,16 @@ public partial class CommonServices : BaseServices<RootEntityTkey<int>>, 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<RootEntityTkey<int>>, 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<RootEntityTkey<int>>, 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<Ghrh_HumanRequest>(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;
         }
 

Tiobon.Core.Services/Ghrh/Ghrh_OfferApplyOrderServices.cs

@@ -1,6 +1,4 @@
-using Microsoft.IdentityModel.Tokens;
+namespace Tiobon.Core.Services;
-
-namespace Tiobon.Core.Services;
 
 /// <summary>
 /// 录用审批单 (服务)
@@ -111,6 +109,14 @@ public class Ghrh_OfferApplyOrderServices : BaseServices<Ghrh_OfferApplyOrder, G
         entity.ApplyTime = DateTime.Now;
         var id = await base.Add(entity);
 
+        #region  写入数据,并判断是否有错误 
+        var sql = $"SELECT ISNULL(MAX(id)+1,1) FROM Ghrh_OfferApplyOrder 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
+
         if (entity.Items.IsNotEmptyOrNull())
         {
             entity.Items.ForEach(x =>
@@ -119,6 +125,33 @@ public class Ghrh_OfferApplyOrderServices : BaseServices<Ghrh_OfferApplyOrder, G
             });
             await _ghrh_OfferApplyOrderSalaryServices.Add(entity.Items);
         }
+
+
+        #region 生成流程数据
+        sql = $"Select FlowID from Ghrw_Flow where FlowNo='F_ESS_RecruitOfferApply' AND IsEnable=1";
+        int @FlowID = await Db.Ado.GetIntAsync(sql);
+        sql = @$"DECLARE @return_value int;
+
+                DECLARE @ErrorMsg nvarchar(2000);
+
+                SET @ErrorMsg = NULL;
+
+                EXEC  @return_value = GHR30.dbo.[PT_GHR30_FlowApply] 
+                    @ID = {id},
+                    @FlowID = {@FlowID},
+                    @UserID = {App.User.ID},
+                    @LangID = 1,
+                    @ErrorMsg = @ErrorMsg out;
+
+                SELECT @ErrorMsg as N'@ErrorMsg', @return_value as N'@Return Value';";
+
+        var message = await Db.Ado.GetStringAsync(sql);
+
+        if (message.IsNotEmptyOrNull())
+            throw new Exception(message);
+
+        #endregion
+
         return id;
     }
 

Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs

@@ -287,6 +287,9 @@ public class Ghrh_ResumeServices : BaseServices<Ghrh_Resume, Ghrh_ResumeDto, Ins
         tagIds = tagIds.Distinct().ToList();
         var tags = await _ghrh_ResumeTagServices.QueryDto(x => tagIds.Contains(x.Id));
 
+        #region 查询审批流程状态
+        var config = await Db.Queryable<Ghrh_Config>().Where(x => x.ConfigCode == "ESS_Recruit_Custom_Offer_Apply").FirstAsync();
+        #endregion
 
         list.ForEach(async x =>
         {
@@ -335,6 +338,11 @@ public class Ghrh_ResumeServices : BaseServices<Ghrh_Resume, Ghrh_ResumeDto, Ins
                     //x.InterviewResult = "推荐中";
                     x.AppointmentFeedback = order.AppointmentFeedback.IsNotEmptyOrNull() ? order.AppointmentFeedback : "(约面反馈未填写)";
                 }
+                else if (x.Status == DIC_INTERVIEW_ORDER_STATUS.HasInterview && x.IsPass == true)
+                {
+                    //x.InterviewResult = "推荐中";
+                    x.OfferApplyType = config?.ConfigValue ?? "System";
+                }
 
                 x.InterviewTime1 = order.InterviewTime;
                 x.InterviewContent = order.InterviewContent;

Tiobon.Core/Tiobon.Core.Model.xml

@@ -25147,6 +25147,11 @@
             约面反馈
             </summary> 
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghrh_ResumeDto.OfferApplyType">
+            <summary>
+            审批类型，线上审批or不走审批
+            </summary> 
+        </member>
         <member name="T:Tiobon.Core.Model.Models.Ghrh_ResumeEduBGDto">
             <summary>
             教育背景(Dto.View1)