From e27cc14bb513c605b2712fbbda2c2ae15aa2b97f Mon Sep 17 00:00:00 2001
From: xiaochanghai <xiaochanghai@foxmail.com>
Date: Thu, 5 Dec 2024 18:25:23 +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         |  9 ++++++--
 .../Ghrh/Ghrh_ResumeServices.cs               | 21 +++++++++++++------
 Tiobon.Core/Tiobon.Core.Model.xml             |  5 +++++
 4 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/Tiobon.Core.Api/Tiobon.Core.Model.xml b/Tiobon.Core.Api/Tiobon.Core.Model.xml
index 0cbf6ef0..2ddef50c 100644
--- a/Tiobon.Core.Api/Tiobon.Core.Model.xml
+++ b/Tiobon.Core.Api/Tiobon.Core.Model.xml
@@ -24862,6 +24862,11 @@
             面试评估
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghrh_ResumeDto.AppointmentFeedback">
+            <summary>
+            约面反馈
+            </summary> 
+        </member>
         <member name="T:Tiobon.Core.Model.Models.Ghrh_ResumeEduBGDto">
             <summary>
             教育背景(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 43b76c2f..4605d1fc 100644
--- a/Tiobon.Core.Model/View/Ghrh/Ghrh_Resume.Dto.View.cs
+++ b/Tiobon.Core.Model/View/Ghrh/Ghrh_Resume.Dto.View.cs
@@ -92,7 +92,7 @@ public class Ghrh_ResumeDto : Ghrh_Resume
     /// <summary>
     /// 学历
     /// </summary>
-    public string EduDegreeLabel { get; set; }    
+    public string EduDegreeLabel { get; set; }
 
     /// <summary>
     /// 标签
@@ -151,7 +151,7 @@ public class Ghrh_ResumeDto : Ghrh_Resume
     public string InterviewResult { get; set; }
 
     public string InterviewResultRemark { get; set; }
-    
+
     /// <summary>
     /// 是否通过
     /// </summary>
@@ -221,4 +221,9 @@ public class Ghrh_ResumeDto : Ghrh_Resume
     /// 面试评估
     /// </summary>
     public string InterviewContent { get; set; }
+
+    /// <summary>
+    /// 约面反馈
+    /// </summary> 
+    public string AppointmentFeedback { get; set; }
 }
diff --git a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs
index 9d4c7751..47abfe2b 100644
--- a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs
+++ b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs
@@ -278,7 +278,7 @@ public class Ghrh_ResumeServices : BaseServices<Ghrh_Resume, Ghrh_ResumeDto, Ins
             if (x.Tags.IsNotEmptyOrNull())
                 tagIds.AddRange(JsonHelper.JsonToObj<List<long>>(x.Tags));
         });
-
+        
         var orders = await _ghrh_InterviewOrderServices.QueryDto(x => x.ResumeId != null && ids.Contains(x.ResumeId.Value));
         tagIds = tagIds.Distinct().ToList();
         var tags = await _ghrh_ResumeTagServices.QueryDto(x => tagIds.Contains(x.Id));
@@ -316,10 +316,20 @@ public class Ghrh_ResumeServices : BaseServices<Ghrh_Resume, Ghrh_ResumeDto, Ins
                     x.Interviewer = order.Interviewer;
                 }
 
-                if (x.Status == DIC_INTERVIEW_ORDER_STATUS.HasRecommended)
+                if (x.Status == DIC_INTERVIEW_ORDER_STATUS.Fail)
                 {
                     x.InterviewResult = order.InterviewResult;
-                    x.InterviewResultRemark = order.FilterFeedback;
+                    x.InterviewResultRemark = order.FilterFeedback.IsNotEmptyOrNull() ? order.FilterFeedback : "(不合适原因未填写)"; 
+                }
+               else if (x.Status == DIC_INTERVIEW_ORDER_STATUS.HasRecommended)
+                {
+                    x.InterviewResult = "推荐中";
+                    x.InterviewResultRemark = order.RecommendRemark.IsNotEmptyOrNull()? order.RecommendRemark : "(推荐说明未填写)";
+                }
+                else if (x.Status == DIC_INTERVIEW_ORDER_STATUS.WaitAppointment)
+                {
+                    //x.InterviewResult = "推荐中";
+                    x.AppointmentFeedback = order.AppointmentFeedback.IsNotEmptyOrNull() ? order.AppointmentFeedback : "(约面反馈未填写)";
                 }
 
                 x.InterviewTime1 = order.InterviewTime;
@@ -329,7 +339,6 @@ public class Ghrh_ResumeServices : BaseServices<Ghrh_Resume, Ghrh_ResumeDto, Ins
                     x.InterviewTime1 = "已取消";
                 else if (order.WaitInterviewStatus == "HasChangeInterviewTime")
                     x.InterviewTime1 = "已改期";
-
             }
         });
 
@@ -2029,7 +2038,7 @@ END";
             order.Status = DIC_INTERVIEW_ORDER_STATUS.Fail;
             order.InterviewResult = "不合适";
             order.FilterFeedback = input.Content;
-            await _ghrh_InterviewOrderServices.Update(order, ["Status", "InterviewResult", "InterviewResultRemark"]);
+            await _ghrh_InterviewOrderServices.Update(order, ["Status", "InterviewResult", "FilterFeedback"]);
 
             var records = await _ghrh_InterviewRecordServices.Query(x => x.Round == order.Round && x.OrderId == order.Id);
             records.ForEach(record =>
@@ -2038,7 +2047,7 @@ END";
                 record.InterviewResult = "不合适";
                 record.FilterFeedback = input.Content;
             });
-            await _ghrh_InterviewRecordServices.Update(records, ["Status", "InterviewResult", "InterviewResultRemark"]);
+            await _ghrh_InterviewRecordServices.Update(records, ["Status", "InterviewResult", "FilterFeedback"]);
             await LogRecord(order.Id, "变更状态为：不合适！");
         }
         return ServiceResult.OprateSuccess();
diff --git a/Tiobon.Core/Tiobon.Core.Model.xml b/Tiobon.Core/Tiobon.Core.Model.xml
index 0cbf6ef0..2ddef50c 100644
--- a/Tiobon.Core/Tiobon.Core.Model.xml
+++ b/Tiobon.Core/Tiobon.Core.Model.xml
@@ -24862,6 +24862,11 @@
             面试评估
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghrh_ResumeDto.AppointmentFeedback">
+            <summary>
+            约面反馈
+            </summary> 
+        </member>
         <member name="T:Tiobon.Core.Model.Models.Ghrh_ResumeEduBGDto">
             <summary>
             教育背景(Dto.View1)