简历库 补充逻辑调整

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

@@ -6445,6 +6445,11 @@
             面试环节
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghrh_InterviewOrderBase.FilterFeedback">
+            <summary>
+            筛选反馈
+            </summary>
+        </member>
         <member name="P:Tiobon.Core.Model.Models.Ghrh_InterviewOrderBase.AppointmentFeedback">
             <summary>
             约面反馈
@@ -6620,6 +6625,11 @@
             取消原因
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghrh_InterviewRecordBase.FilterFeedback">
+            <summary>
+            筛选反馈
+            </summary>
+        </member>
         <member name="P:Tiobon.Core.Model.Models.Ghrh_InterviewRecordBase.AppointmentFeedback">
             <summary>
             约面反馈
@@ -17326,6 +17336,11 @@
             面试环节
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghrh_InterviewOrder.FilterFeedback">
+            <summary>
+            筛选反馈
+            </summary>
+        </member>
         <member name="P:Tiobon.Core.Model.Models.Ghrh_InterviewOrder.AppointmentFeedback">
             <summary>
             约面反馈
@@ -17506,6 +17521,11 @@
             约面反馈
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghrh_InterviewRecord.FilterFeedback">
+            <summary>
+            筛选反馈
+            </summary>
+        </member>
         <member name="P:Tiobon.Core.Model.Models.Ghrh_InterviewRecord.Status">
             <summary>
             状态
@@ -22547,6 +22567,11 @@
             面试时间
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghrh_ResumeDto.InterviewTime1">
+            <summary>
+            面试时间
+            </summary>
+        </member>
         <member name="T:Tiobon.Core.Model.Models.Ghrh_ResumeEduBGDto">
             <summary>
             教育背景(Dto.View1)

Tiobon.Core.Model/Base/Ghrh/Ghrh_InterviewOrder.Dto.Base.cs

@@ -145,6 +145,12 @@ public class Ghrh_InterviewOrderBase
     [Display(Name = "InterviewStepName"), Description("面试环节"), MaxLength(32, ErrorMessage = "面试环节 不能超过 32 个字符")]
     public string InterviewStepName { get; set; }
 
+    /// <summary>
+    /// 筛选反馈
+    /// </summary>
+    [Display(Name = "FilterFeedback"), Description("筛选反馈"), MaxLength(256, ErrorMessage = "筛选反馈 不能超过 256 个字符")]
+    public string FilterFeedback { get; set; }
+
     /// <summary>
     /// 约面反馈
     /// </summary>

Tiobon.Core.Model/Base/Ghrh/Ghrh_InterviewRecord.Dto.Base.cs

@@ -122,6 +122,12 @@ public class Ghrh_InterviewRecordBase
     [Display(Name = "CancelReason"), Description("取消原因"), MaxLength(256, ErrorMessage = "取消原因 不能超过 256 个字符")]
     public string CancelReason { get; set; }
 
+    /// <summary>
+    /// 筛选反馈
+    /// </summary>
+    [Display(Name = "FilterFeedback"), Description("筛选反馈"), MaxLength(256, ErrorMessage = "筛选反馈 不能超过 256 个字符")]
+    public string FilterFeedback { get; set; }
+
     /// <summary>
     /// 约面反馈
     /// </summary>

Tiobon.Core.Model/Models/Ghrh/Ghrh_InterviewOrder.cs

@@ -146,6 +146,12 @@ public class Ghrh_InterviewOrder : BasePoco
     [Display(Name = "InterviewStepName"), Description("面试环节"), MaxLength(32, ErrorMessage = "面试环节 不能超过 32 个字符")]
     public string InterviewStepName { get; set; }
 
+    /// <summary>
+    /// 筛选反馈
+    /// </summary>
+    [Display(Name = "FilterFeedback"), Description("筛选反馈"), MaxLength(256, ErrorMessage = "筛选反馈 不能超过 256 个字符")]
+    public string FilterFeedback { get; set; }
+
     /// <summary>
     /// 约面反馈
     /// </summary>

Tiobon.Core.Model/Models/Ghrh/Ghrh_InterviewRecord.cs

@@ -129,6 +129,12 @@ public class Ghrh_InterviewRecord : BasePoco
     [Display(Name = "AppointmentFeedback"), Description("约面反馈"), MaxLength(256, ErrorMessage = "约面反馈 不能超过 256 个字符")]
     public string AppointmentFeedback { get; set; }
 
+    /// <summary>
+    /// 筛选反馈
+    /// </summary>
+    [Display(Name = "FilterFeedback"), Description("筛选反馈"), MaxLength(256, ErrorMessage = "筛选反馈 不能超过 256 个字符")]
+    public string FilterFeedback { get; set; }
+
     /// <summary>
     /// 状态
     /// </summary>

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

@@ -203,4 +203,9 @@ public class Ghrh_ResumeDto : Ghrh_Resume
     /// 面试时间
     /// </summary>
     public string InterviewTime { get; set; }
+
+    /// <summary>
+    /// 面试时间
+    /// </summary>
+    public string InterviewTime1 { get; set; }
 }

Tiobon.Core.Services/Ghrh/Ghrh_InterviewOrderServices.cs

@@ -52,11 +52,11 @@ public class Ghrh_InterviewOrderServices : BaseServices<Ghrh_InterviewOrder, Ghr
             if (record != null)
             {
                 if (record.PlanInterviewTime1.IsNotEmptyOrNull())
-                    x.OptionalInterviewTime = record.PlanInterviewTime1;
+                    x.OptionalInterviewTime += record.PlanInterviewTime1;
                 if (record.PlanInterviewTime2.IsNotEmptyOrNull())
                     x.OptionalInterviewTime += "," + record.PlanInterviewTime2;
                 if (record.PlanInterviewTime3.IsNotEmptyOrNull())
-                    x.OptionalInterviewTime = "," + record.PlanInterviewTime3;
+                    x.OptionalInterviewTime += "," + record.PlanInterviewTime3;
                 x.InterviewTime = record.InterviewTime;
             }
         });

Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs

@@ -292,16 +292,25 @@ public class Ghrh_ResumeServices : BaseServices<Ghrh_Resume, Ghrh_ResumeDto, Ins
             if (order != null)
             {
                 x.IsPass = order.IsPass;
+                if (order.IsPass != null)
                     x.IsPassLabel = order.IsPass == true ? "通过" : "不通过";
                 x.InterviewResult = order.InterviewResult;
                 x.OptionalInterviewTime = order.OptionalInterviewTime;
                 x.InterviewTime = order.InterviewTime;
-                if (x.Status == DIC_INTERVIEW_ORDER_STATUS.HasRecommended)
+                if (x.Status != DIC_INTERVIEW_ORDER_STATUS.WaitRecommended)
                 {
                     x.HireDeptName = order.HireDeptName;
                     x.HireTitleName = order.HireTitleName;
                     x.Interviewer = order.Interviewer;
                 }
+
+                x.InterviewTime1 = order.InterviewTime;
+
+                if (order.WaitInterviewStatus == "Cancel")
+                    x.InterviewTime1 = "已取消";
+                else if (order.WaitInterviewStatus == "HasChangeInterviewTime")
+                    x.InterviewTime1 = "已改期";
+
             }
             x.Birthday1 = DateTimeHelper.ConvertToDayString(x.Birthday);
         });
@@ -1486,11 +1495,22 @@ END";
         if (order != null)
         {
 
-            order.Status = DIC_INTERVIEW_ORDER_STATUS.WaitAppointment;
+
-            order.AppointmentFeedback = form.Remark;
+
-            await _ghrh_InterviewOrderServices.Update(order, ["Status", "AppointmentFeedback"]);
+            bool isChangeInterviewTime = false;
 
             var records = await _ghrh_InterviewRecordServices.Query(x => x.Round == order.Round && x.OrderId == order.Id);
+            records.ForEach(record =>
+            {
+                record.Status = DIC_INTERVIEW_ORDER_STATUS.WaitAppointment;
+                record.RemarkSz = form.Remark;
+                if (record.PlanInterviewTime1.IsNotEmptyOrNull() || record.PlanInterviewTime2.IsNotEmptyOrNull() || record.PlanInterviewTime3.IsNotEmptyOrNull())
+                    isChangeInterviewTime = true;
+                if (isChangeInterviewTime)
+                    record.WaitInterviewStatus = "HasChangeInterviewTime";
+
+            });
+
             for (int i = 0; i < form.Times.Count; i++)
             {
                 if (i == 0)
@@ -1500,11 +1520,12 @@ END";
                 else if (i == 2)
                     records.ForEach(record => record.PlanInterviewTime3 = form.Times[i]);
             }
-            records.ForEach(record =>
+            if (isChangeInterviewTime)
-            {
+                order.WaitInterviewStatus = "HasChangeInterviewTime";
-                record.Status = DIC_INTERVIEW_ORDER_STATUS.WaitAppointment;
+
-                record.RemarkSz = form.Remark;
+            order.Status = DIC_INTERVIEW_ORDER_STATUS.WaitAppointment;
-            });
+            order.AppointmentFeedback = form.Remark;
+            await _ghrh_InterviewOrderServices.Update(order, ["Status", "AppointmentFeedback"]);
 
             await _ghrh_InterviewRecordServices.Update(records[0], ["PlanInterviewTime1", "PlanInterviewTime2", "PlanInterviewTime3", "Status"]);
 
@@ -1893,7 +1914,7 @@ END";
 
             order.Status = DIC_INTERVIEW_ORDER_STATUS.Fail;
             order.InterviewResult = "不合适";
-            order.AppointmentFeedback = input.Content;
+            order.FilterFeedback = input.Content;
             await _ghrh_InterviewOrderServices.Update(order, ["Status", "InterviewResult", "InterviewResultRemark"]);
 
             var records = await _ghrh_InterviewRecordServices.Query(x => x.Round == order.Round && x.OrderId == order.Id);
@@ -1901,7 +1922,7 @@ END";
             {
                 record.Status = DIC_INTERVIEW_ORDER_STATUS.Fail;
                 record.InterviewResult = "不合适";
-                record.AppointmentFeedback = input.Content;
+                record.FilterFeedback = input.Content;
             });
             await _ghrh_InterviewRecordServices.Update(records, ["Status", "InterviewResult", "InterviewResultRemark"]);
             await LogRecord(order.Id, "变更状态为：不合适！");

Tiobon.Core/Tiobon.Core.Model.xml

@@ -6445,6 +6445,11 @@
             面试环节
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghrh_InterviewOrderBase.FilterFeedback">
+            <summary>
+            筛选反馈
+            </summary>
+        </member>
         <member name="P:Tiobon.Core.Model.Models.Ghrh_InterviewOrderBase.AppointmentFeedback">
             <summary>
             约面反馈
@@ -6620,6 +6625,11 @@
             取消原因
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghrh_InterviewRecordBase.FilterFeedback">
+            <summary>
+            筛选反馈
+            </summary>
+        </member>
         <member name="P:Tiobon.Core.Model.Models.Ghrh_InterviewRecordBase.AppointmentFeedback">
             <summary>
             约面反馈
@@ -17326,6 +17336,11 @@
             面试环节
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghrh_InterviewOrder.FilterFeedback">
+            <summary>
+            筛选反馈
+            </summary>
+        </member>
         <member name="P:Tiobon.Core.Model.Models.Ghrh_InterviewOrder.AppointmentFeedback">
             <summary>
             约面反馈
@@ -17506,6 +17521,11 @@
             约面反馈
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghrh_InterviewRecord.FilterFeedback">
+            <summary>
+            筛选反馈
+            </summary>
+        </member>
         <member name="P:Tiobon.Core.Model.Models.Ghrh_InterviewRecord.Status">
             <summary>
             状态
@@ -22547,6 +22567,11 @@
             面试时间
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghrh_ResumeDto.InterviewTime1">
+            <summary>
+            面试时间
+            </summary>
+        </member>
         <member name="T:Tiobon.Core.Model.Models.Ghrh_ResumeEduBGDto">
             <summary>
             教育背景(Dto.View1)