From 218aec1af67c8eaab03c32863e845689343da30b Mon Sep 17 00:00:00 2001
From: xiaochanghai <xiaochanghai@foxmail.com>
Date: Tue, 22 Oct 2024 14:49:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=8E=B7=E5=8F=96=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Tiobon.Core.Api/Tiobon.Core.Model.xml               | 10 ++++++++++
 Tiobon.Core.Model/Base/Ghrh/Ghrh_Resume.Dto.Base.cs |  6 ++++++
 Tiobon.Core.Model/Models/Ghrh/Ghrh_Resume.cs        |  6 ++++++
 Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs    |  7 ++++++-
 Tiobon.Core/Tiobon.Core.Model.xml                   | 10 ++++++++++
 5 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/Tiobon.Core.Api/Tiobon.Core.Model.xml b/Tiobon.Core.Api/Tiobon.Core.Model.xml
index 24cd6c41..e14588fe 100644
--- a/Tiobon.Core.Api/Tiobon.Core.Model.xml
+++ b/Tiobon.Core.Api/Tiobon.Core.Model.xml
@@ -6215,6 +6215,11 @@
             状态
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghrh_ResumeBase.WorkYears">
+            <summary>
+            工作年限
+            </summary>
+        </member>
         <member name="P:Tiobon.Core.Model.Models.Ghrh_ResumeBase.RemarkSz">
             <summary>
             备注
@@ -14886,6 +14891,11 @@
             状态
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghrh_Resume.WorkYears">
+            <summary>
+            工作年限
+            </summary>
+        </member>
         <member name="P:Tiobon.Core.Model.Models.Ghrh_Resume.RemarkSz">
             <summary>
             备注
diff --git a/Tiobon.Core.Model/Base/Ghrh/Ghrh_Resume.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghrh/Ghrh_Resume.Dto.Base.cs
index 9053627d..4d469470 100644
--- a/Tiobon.Core.Model/Base/Ghrh/Ghrh_Resume.Dto.Base.cs
+++ b/Tiobon.Core.Model/Base/Ghrh/Ghrh_Resume.Dto.Base.cs
@@ -318,6 +318,12 @@ namespace Tiobon.Core.Model.Models
         [Display(Name = "Status"), Description("状态"), MaxLength(32, ErrorMessage = "状态 不能超过 32 个字符")]
         public string Status { get; set; }
 
+        /// <summary>
+        /// 工作年限
+        /// </summary>
+        [Display(Name = "WorkYears"), Description("工作年限"), Column(TypeName = "decimal(3,1)")]
+        public decimal? WorkYears { get; set; }
+
         /// <summary>
         /// 备注
         /// </summary>
diff --git a/Tiobon.Core.Model/Models/Ghrh/Ghrh_Resume.cs b/Tiobon.Core.Model/Models/Ghrh/Ghrh_Resume.cs
index d1a2de22..11d789fe 100644
--- a/Tiobon.Core.Model/Models/Ghrh/Ghrh_Resume.cs
+++ b/Tiobon.Core.Model/Models/Ghrh/Ghrh_Resume.cs
@@ -320,6 +320,12 @@ namespace Tiobon.Core.Model.Models
         [Display(Name = "Status"), Description("状态"), MaxLength(32, ErrorMessage = "状态 不能超过 32 个字符")]
         public string Status { get; set; }
 
+        /// <summary>
+        /// 工作年限
+        /// </summary>
+        [Display(Name = "WorkYears"), Description("工作年限"), Column(TypeName = "decimal(3,1)")]
+        public decimal? WorkYears { get; set; }
+
         /// <summary>
         /// 备注
         /// </summary>
diff --git a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs
index c417b44b..2dd63fdb 100644
--- a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs
+++ b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs
@@ -62,13 +62,18 @@ public class Ghrh_ResumeServices : BaseServices<Ghrh_Resume, Ghrh_ResumeDto, Ins
     #region 获取查询条件
     public async Task<ServiceResult<List<ResumeCondition>>> QueryConditions()
     {
-        string str = "[\r\n\t{\r\n\t\t\"Key\": \"Education\",\r\n\t\t\"Name\": \"学历要求\",\r\n\t\t\"ParaMasterNo\": \"EducationalBGLevel\"\r\n\t},\r\n\t{\r\n\t\t\"Key\": null,\r\n\t\t\"Name\": \"经验要求\",\r\n\t\t\"ParaMasterNo\": \"EducationalBGLevel\"\r\n\t},\r\n\t{\r\n\t\t\"Key\": \"Age\",\r\n\t\t\"Name\": \"年龄要求\",\r\n\t\t\"ParaMasterNo\": \"AgePeriodSetup\"\r\n\t},\r\n\t{\r\n\t\t\"Key\": \"Gender\",\r\n\t\t\"Name\": \"性  别\",\r\n\t\t\"ParaMasterNo\": \"Gender\"\r\n\t},\r\n\t{\r\n\t\t\"Key\": \"Apply\",\r\n\t\t\"Name\": \"薪资区间\",\r\n\t\t\"ParaMasterNo\": \"SeniorityPeriodSetup\"\r\n\t},\r\n\t{\r\n\t\t\"Key\": \"ApplyStatus\",\r\n\t\t\"Name\": \"求职状态\",\r\n\t\t\"ParaMasterNo\": \"ResumeApplyStatus\"\r\n\t}\r\n]";
+        string str = "[\r\n\t{\r\n\t\t\"Key\": \"Education\",\r\n\t\t\"Name\": \"学历要求\",\r\n\t\t\"ParaMasterNo\": \"EducationalBGLevel\"\r\n\t},\r\n\t{\r\n\t\t\"Key\": \"WorkYears\",\r\n\t\t\"Name\": \"经验要求\",\r\n\t\t\"ParaMasterNo\": \"EducationalBGLevel\"\r\n\t},\r\n\t{\r\n\t\t\"Key\": \"Age\",\r\n\t\t\"Name\": \"年龄要求\",\r\n\t\t\"ParaMasterNo\": \"AgePeriodSetup\"\r\n\t},\r\n\t{\r\n\t\t\"Key\": \"Gender\",\r\n\t\t\"Name\": \"性  别\",\r\n\t\t\"ParaMasterNo\": \"Gender\"\r\n\t},\r\n\t{\r\n\t\t\"Key\": \"SalaryPeriod\",\r\n\t\t\"Name\": \"薪资区间\",\r\n\t\t\"ParaMasterNo\": \"SalaryPeriodSetup\"\r\n\t},\r\n\t{\r\n\t\t\"Key\": \"ApplyStatus\",\r\n\t\t\"Name\": \"求职状态\",\r\n\t\t\"ParaMasterNo\": \"ResumeApplyStatus\"\r\n\t},\r\n\t{\r\n\t\t\"Key\": \"Tags\",\r\n\t\t\"Name\": \"标签\",\r\n\t\t\"ParaMasterNo\": \"ResumeTag\"\r\n\t}\r\n]";
         var tabs = JsonHelper.JsonToObj<List<ResumeCondition>>(str);
 
         tabs.ForEach(async x =>
         {
             var items = await GetParaList(x.ParaMasterNo);
+            if (x.Key == "Tags")
+                items.Insert(0, new Ghrs_ParaDetail() { ParaDetailNo = "NoFliter", ParaDetailName = "未打标签" });
+            else
+                items.Insert(0, new Ghrs_ParaDetail() { ParaDetailNo = "NoFliter", ParaDetailName = "不限" });
             x.Items = items.ToDictionary(item => item.ParaDetailNo, item => item.ParaDetailName);
+
         });
 
         return ServiceResult<List<ResumeCondition>>.OprateSuccess("查询成功！", tabs);
diff --git a/Tiobon.Core/Tiobon.Core.Model.xml b/Tiobon.Core/Tiobon.Core.Model.xml
index 24cd6c41..e14588fe 100644
--- a/Tiobon.Core/Tiobon.Core.Model.xml
+++ b/Tiobon.Core/Tiobon.Core.Model.xml
@@ -6215,6 +6215,11 @@
             状态
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghrh_ResumeBase.WorkYears">
+            <summary>
+            工作年限
+            </summary>
+        </member>
         <member name="P:Tiobon.Core.Model.Models.Ghrh_ResumeBase.RemarkSz">
             <summary>
             备注
@@ -14886,6 +14891,11 @@
             状态
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghrh_Resume.WorkYears">
+            <summary>
+            工作年限
+            </summary>
+        </member>
         <member name="P:Tiobon.Core.Model.Models.Ghrh_Resume.RemarkSz">
             <summary>
             备注