youhu

Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs

@@ -2,6 +2,7 @@
 using DinkToPdf.Contracts;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Hosting;
+using Microsoft.IdentityModel.Tokens;
 using System.IO.Compression;
 using static Tiobon.Core.Model.Consts;
 
@@ -97,6 +98,8 @@ public class Ghrh_ResumeServices : BaseServices<Ghrh_Resume, Ghrh_ResumeDto, Ins
     {
         if (x != null)
         {
+            if (x.Education.IsNullOrEmpty())
+                x.Education = x.EduDegree;
             x.TitleLabel = x.TitleName;
             x.GenderLabel = await GetParaLabel("Gender", x.Gender);
             x.EducationLabel = await GetParaLabel("EducationalBGLevel", x.Education);
@@ -107,7 +110,7 @@ public class Ghrh_ResumeServices : BaseServices<Ghrh_Resume, Ghrh_ResumeDto, Ins
             x.CertificateTypeLabel = await GetParaLabel("D51", x.CertificateType);
             x.RegisteredTypeLabel = await GetParaLabel("A08", x.RegisteredType);
             x.ApplyStatusLabel = await GetParaLabel("ResumeApplyStatus", x.ApplyStatus);
-            x.ChannelLabel = await GetParaLabel("ResumeApplyStatus", x.Channel);
+            x.ChannelLabel = await GetParaLabel("ResumeChannel", x.Channel);
             x.EduDegreeLabel = await GetParaLabel("EducationalBGLevel", x.EduDegree);
 
             #region 计算年龄
@@ -181,6 +184,7 @@ public class Ghrh_ResumeServices : BaseServices<Ghrh_Resume, Ghrh_ResumeDto, Ins
                         break;
 
                     case "SalaryPeriod":
+                    case "EduDegree":
                     case "Education":
                     case "ApplyStatus":
                     case "Gender":
@@ -278,7 +282,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));
@@ -319,14 +323,14 @@ public class Ghrh_ResumeServices : BaseServices<Ghrh_Resume, Ghrh_ResumeDto, Ins
                 if (x.Status == DIC_INTERVIEW_ORDER_STATUS.Fail)
                 {
                     x.InterviewResult = order.InterviewResult;
-                    x.InterviewResultRemark = order.FilterFeedback.IsNotEmptyOrNull() ? order.FilterFeedback : "(不合适原因未填写)"; 
+                    x.InterviewResultRemark = order.FilterFeedback.IsNotEmptyOrNull() ? order.FilterFeedback : "(不合适原因未填写)";
                 }
-               else if (x.Status == DIC_INTERVIEW_ORDER_STATUS.HasRecommended)
+                else if (x.Status == DIC_INTERVIEW_ORDER_STATUS.HasRecommended)
                 {
                     x.InterviewResult = "推荐中";
-                    x.InterviewResultRemark = order.RecommendRemark.IsNotEmptyOrNull()? order.RecommendRemark : "(推荐说明未填写)";
+                    x.InterviewResultRemark = order.RecommendRemark.IsNotEmptyOrNull() ? order.RecommendRemark : "(推荐说明未填写)";
                 }
-                else if (x.Status == DIC_INTERVIEW_ORDER_STATUS.WaitAppointment)
+                else if (x.Status == DIC_INTERVIEW_ORDER_STATUS.WaitAppointment || x.Status == DIC_INTERVIEW_ORDER_STATUS.WaitInterview)
                 {
                     //x.InterviewResult = "推荐中";
                     x.AppointmentFeedback = order.AppointmentFeedback.IsNotEmptyOrNull() ? order.AppointmentFeedback : "(约面反馈未填写)";
@@ -1136,7 +1140,7 @@ END";
             resume.Base.Age = age;
         }
         #endregion
-
+        resume.Base.Education = resume.Base.EduDegree;
         await base.Update(id, resume.Base);
 
         await _ghrh_ResumeHomeServices.Delete(x => x.ResumeId != null && x.ResumeId == id);//家庭关系