优化

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

@@ -28197,6 +28197,11 @@
             生日
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghrh_ResumeDto.HireCompanyName">
+            <summary>
+            录用公司
+            </summary>
+        </member>
         <member name="P:Tiobon.Core.Model.Models.Ghrh_ResumeDto.HireDeptName">
             <summary>
             用人部门

Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs

@@ -2,6 +2,7 @@
 using DinkToPdf.Contracts;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Hosting;
+using System.ComponentModel.Design;
 using System.IO.Compression;
 using static Tiobon.Core.Model.Consts;
 
@@ -290,7 +291,6 @@ public class Ghrh_ResumeServices : BaseServices<Ghrh_Resume, Ghrh_ResumeDto, Ins
         var ids = list.Select(x => x.Id).ToList();
         var titleIds = list.Where(x => x.TitleId != null).Select(x => x.TitleId.Value).Distinct().ToList();
 
-        var titles = await Db.Queryable<Ghra_Title>().Where(x => x.TitleID != null && titleIds.Contains(x.TitleID.Value)).ToListAsync();
         var eduBGs = await _ghrh_ResumeEduBGServices.QueryDto(x => x.ResumeId != null && ids.Contains(x.ResumeId.Value));
         var workExps = await _ghrh_ResumeWorkExpServices.QueryDto(x => x.ResumeId != null && ids.Contains(x.ResumeId.Value));
 
@@ -311,7 +311,15 @@ public class Ghrh_ResumeServices : BaseServices<Ghrh_Resume, Ghrh_ResumeDto, Ins
         //【简历库-录用-已发offer】配置按钮
         var sendOfferConfig = await Db.Queryable<Ghrh_Config>().Where(x => x.ConfigCode == "ESS_Recruit_Custom_Transfer_Staff").FirstAsync();
 
-        var applyOrders = await Db.Queryable<Ghrh_OfferApplyOrder>().Where(x => x.ResumeId != null && ids.Contains(x.ResumeId.Value) && x.WorkState == 0).ToListAsync();
+        var applyOrders = await Db.Queryable<Ghrh_OfferApplyOrder>().Where(x => x.ResumeId != null && ids.Contains(x.ResumeId.Value)).ToListAsync();
+
+        var companyIds = applyOrders.Where(x => x.CompanyId != null).Select(x => x.CompanyId).ToList();
+        var deptIds = applyOrders.Where(x => x.DeptId != null).Select(x => x.DeptId).ToList();
+        titleIds.AddRange(applyOrders.Where(x => x.TitleId != null).Select(x => x.TitleId.Value).ToList());
+        var legalCompanys = await Db.Queryable<Ghra_LegalCompany>().Where(x => companyIds.Contains(x.LegalCompanyID)).ToListAsync();
+        var depts = await Db.Queryable<Ghro_Dept>().Where(x => deptIds.Contains(x.DeptID)).ToListAsync();
+        var titles = await Db.Queryable<Ghra_Title>().Where(x => x.TitleID != null && titleIds.Contains(x.TitleID.Value)).ToListAsync();
+
         #endregion
 
         list.ForEach(async x =>
@@ -363,30 +371,33 @@ public class Ghrh_ResumeServices : BaseServices<Ghrh_Resume, Ghrh_ResumeDto, Ins
                     //x.InterviewResult = "推荐中";
                     x.AppointmentFeedback = order.AppointmentFeedback.IsNotEmptyOrNull() ? order.AppointmentFeedback : "(约面反馈未填写)";
                 }
-                if (x.Status == DIC_INTERVIEW_ORDER_STATUS.HasSendOffer)
-                {
                 //x.InterviewResult = "推荐中";
-                    x.TransferStaffType = sendOfferConfig?.ConfigValue ?? "System";
+
+                x.InterviewTime1 = order.InterviewTime;
+                x.InterviewContent = order.InterviewContent;
+
+                if (order.WaitInterviewStatus == "Cancel")
+                    x.InterviewTime1 = "已取消";
+                else if (order.WaitInterviewStatus == "HasChangeInterviewTime")
+                    x.InterviewTime1 = "已改期";
             }
-                //x.InterviewResult = "推荐中";
+
-                x.OfferApplyType = offerApplyConfig?.ConfigValue ?? "System";
 
             var applyOrder = applyOrders.Where((o => o.ResumeId == x.ResumeId)).SingleOrDefault();
             if (applyOrder != null)
             {
                 if (applyOrder.WorkNo.IsNotEmptyOrNull())
                     x.OfferApplyExist = true;
-                    //x.HireCompanyName = (await Db.Queryable<company>().Where(x => x.DeptID == applyOrder.DeptId).FirstAsync())?.DeptName
+                x.HireCompanyName = legalCompanys.Where(x => x.LegalCompanyID == applyOrder.CompanyId).FirstOrDefault()?.LegalCompanyName;
-                    x.HireDeptName = (await Db.Queryable<Ghro_Dept>().Where(x => x.DeptID == applyOrder.DeptId).FirstAsync())?.DeptName;
+                x.HireDeptName = depts.Where(x => x.DeptID == applyOrder.DeptId).FirstOrDefault()?.DeptName;
-                    x.HireTitleName = (await Db.Queryable<Ghra_Title>().Where(x => x.TitleID == applyOrder.TitleId).FirstAsync())?.TitleName;
+                x.HireTitleName = titles.Where(x => x.TitleID == applyOrder.TitleId).FirstOrDefault()?.TitleName;
             }
-                x.InterviewTime1 = order.InterviewTime;
+            x.OfferApplyType = offerApplyConfig?.ConfigValue ?? "System";
-                x.InterviewContent = order.InterviewContent;
 
-                if (order.WaitInterviewStatus == "Cancel")
+            if (x.Status == DIC_INTERVIEW_ORDER_STATUS.HasSendOffer)
-                    x.InterviewTime1 = "已取消";
+            {
-                else if (order.WaitInterviewStatus == "HasChangeInterviewTime")
+                //x.InterviewResult = "推荐中";
-                    x.InterviewTime1 = "已改期";
+                x.TransferStaffType = sendOfferConfig?.ConfigValue ?? "System";
             }
         });
 
@@ -2432,6 +2443,10 @@ END";
                 await _ghrh_InterviewRecordServices.Update(records, ["Status"]);
                 await LogRecord(order.Id, isOffer == true ? "标记为已报到！" : "标记为未报到！", id, null, "CheckIn");
             }
+            else
+            {
+
+            }
         }
 
         return ServiceResult.OprateSuccess();
@@ -2517,6 +2532,21 @@ END";
             await UpdateResumeStatus(entity, DIC_INTERVIEW_ORDER_STATUS.WaitSendOffer);
 
             var order = await _ghrh_InterviewOrderServices.QuerySingle(x => x.ResumeId == id);
+
+            if (order == null)
+            {
+                var orderId = await _ghrh_InterviewOrderServices.Add(new InsertGhrh_InterviewOrderInput()
+                {
+                    ResumeId = id,
+                    RecommendTime = DateTime.Now,
+                    RecommendId = App.User.ID,
+                    Round = 1,
+                    OrderNo = await GenerateContinuousSequence("Ghrh_InterviewOrder", "OrderNo", "V"),
+                    Status = DIC_INTERVIEW_ORDER_STATUS.WaitSendOffer,
+                });
+                await _ghrh_InterviewOrderServices.QuerySingle(x => x.ResumeId == id);
+            }
+
             if (order != null)
             {
 

Tiobon.Core/Tiobon.Core.Model.xml

@@ -28197,6 +28197,11 @@
             生日
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghrh_ResumeDto.HireCompanyName">
+            <summary>
+            录用公司
+            </summary>
+        </member>
         <member name="P:Tiobon.Core.Model.Models.Ghrh_ResumeDto.HireDeptName">
             <summary>
             用人部门