简历库新增自定义配置查询条件

Tiobon.Core.Services/BASE/BaseServices.cs

@@ -1311,6 +1311,9 @@ ORDER BY SortNo ASC";
 
     public async Task<List<Ghrs_ParaDetail>> GetParaList(string key)
     {
+        if (key.IsNullOrEmpty())
+            return null;
+
         var list = await _caching.GetAsync<List<Ghrs_ParaDetail>>(key);
         if (list == null || (list != null && !list.Any()))
         {

Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs

@@ -1,4 +1,5 @@
-using DinkToPdf;
+using Amazon.Runtime.Internal.Transform;
+using DinkToPdf;
 using DinkToPdf.Contracts;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Hosting;
@@ -469,19 +470,71 @@ 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\": \"WorkYears\",\r\n\t\t\"Name\": \"经验要求\",\r\n\t\t\"ParaMasterNo\": \"ResumeWorkYears\"\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 sql = @"SELECT A.TableName,
-        {
+       A.ColumnName 'Key',
-            var items = await GetParaList(x.ParaMasterNo);
+       A.ResumeInfoColumnNo,
-            if (x.Key == "Tags")
+       A.ResumeInfoColumnName 'Name',
-                items.Insert(0, new Ghrs_ParaDetail() { ParaDetailNo = "NoFliter", ParaDetailName = "未打标签" });
+       A.DataSource,
-            else
+       A.DataSourceType,
-                items.Insert(0, new Ghrs_ParaDetail() { ParaDetailNo = "NoFliter", ParaDetailName = "不限" });
+       A.DataType,
-            x.Items = items.ToDictionary(item => item.ParaDetailNo, item => item.ParaDetailName);
+       A.ColumnType,
+       B.ParaMasterNo
+FROM Ghrh_ResumeInfoColumn A
+     LEFT JOIN Ghrs_ParaMaster B ON A.DataSource = B.ParaMasterId
+WHERE     ResumeInfoGroupId IN (SELECT Id
+                                FROM Ghrh_ResumeInfoGroup
+                                WHERE GroupType = 'Base')
+      AND A.QueryCondition = 1
+ORDER BY A.SortNo ASC";
+
+        var tabs = await Db.Ado.SqlQueryAsync<ResumeCondition>(sql);
+        //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\": \"ResumeWorkYears\"\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.Add(new ResumeCondition() { Key = "Tags", Name = "标签" });
+
+        for (int i = 0; i < tabs.Count; i++)
+        {
+
+            if (tabs[i].Key == "WorkYears")
+                tabs[i].ParaMasterNo = "ResumeWorkYears";
+            var items = await GetParaList(tabs[i].ParaMasterNo);
+
+            if (tabs[i].Key == "Tags")
+            {
+                var tags = await _ghrh_ResumeTagServices.Query();
+                items = tags.Select(x => new Ghrs_ParaDetail()
+                {
+                    ParaDetailNo = x.Id.ToString(),
+                    ParaDetailName = x.TagName
+                }).ToList();
+                //items.Insert(0, new Ghrs_ParaDetail() { ParaDetailNo = "NoFliter", ParaDetailName = "未打标签" });
 
-        });
+            }
+
+            if (items != null)
+            {
+                if (tabs[i].Key != "Tags")
+                {
+                    items.Insert(0, new Ghrs_ParaDetail() { ParaDetailNo = "NoFliter", ParaDetailName = "不限" });
+                    tabs[i].Items = items.ToDictionary(item => item.ParaDetailNo, item => item.ParaDetailName);
+
+                }
+                else
+                {
+                    tabs[i].Items = new Dictionary<string, string>
+                    {
+                        { "NoFliter", "未打标签" }
+                    };
+
+                    items.ForEach(o =>
+                    {
+                        tabs[i].Items.Add(o.ParaDetailNo, o.ParaDetailName);
+                    });
+                }
+            }
+
+        }
 
         return ServiceResult<List<ResumeCondition>>.OprateSuccess("查询成功！", tabs);
 

Tiobon.Core.Services/Ghrh/Ghrh_ResumeTemplateServices.cs

@@ -529,7 +529,8 @@ END";
       @IsRelease                   INT,
       @CanModifyBySelf             INT,
       @multipleSelect              NVARCHAR (100),
-      @CanEssDisplay               INT
+      @CanEssDisplay               INT,
+      @QueryCondition               INT
 
    BEGIN TRY                                                         -- 开始错误处理
       BEGIN TRAN tranResumeInfoColumn                                -- 开始事物处理
@@ -566,6 +567,7 @@ END";
                          @IsQuickJoinColumn = IsQuickJoinColumn,
                          @CanModifyBySelf = CanModifyBySelf,
                          @CanEssDisplay = CanEssDisplay,
+                         @QueryCondition = QueryCondition,
                          @multipleSelect = multipleSelect
                   FROM OPENJSON (@jsonParam) WITH (
                                                ResumeTemplateInfoGroupID NVARCHAR (1000),
@@ -592,9 +594,11 @@ END";
                                                IsQuickJoinColumn INT,
                                                CanModifyBySelf INT,
                                                CanEssDisplay INT,
+                                               QueryCondition INT,
                                                multipleSelect NVARCHAR (100))
                   SET @CanModifyBySelf = isnull (@CanModifyBySelf, 0)
                   SET @CanEssDisplay = isnull (@CanEssDisplay, 0)
+                  SET @QueryCondition = isnull (@QueryCondition, 0)
 
                   IF @ColumnType IN ('Input',
                                      'InputNumber',
@@ -870,6 +874,7 @@ END";
                          DataSourceType = @DataSourceType,
                          CanModifyBySelf = @CanModifyBySelf,
                          CanEssDisplay = @CanEssDisplay,
+                         QueryCondition = @QueryCondition,
                          multipleSelect = @multipleSelect,
                          DataSource = @DataSource,
                          IsRequired = @IsRequired,
@@ -922,6 +927,7 @@ END";
                                  SortNo,
                                  CanModifyBySelf,
                                  CanEssDisplay,
+                                 QueryCondition,
                                  multipleSelect,
                                  OperateLogID,
                                  [CreateBy],
@@ -958,6 +964,7 @@ END";
                             1,
                             @CanModifyBySelf,
                             @CanEssDisplay,
+                            @QueryCondition,
                             @multipleSelect,
                             @OperateLogID,
                             @userId,
@@ -1120,6 +1127,7 @@ END";
                                     a.RemarkSz,
                                     a.CanModifyBySelf,
                                     a.CanEssDisplay,
+                                    a.QueryCondition,
                                     a.multipleSelect,
                                       isnull ((SELECT UserName
                                                FROM Ghrs_User kk
@@ -1168,6 +1176,7 @@ END";
                                     0  IsQuickJoinColumn,
                                     0  CanModifyBySelf,
                                     0  CanEssDisplay,
+                                    0  QueryCondition,
                                     '' multipleSelect,
                                     '' InitValue,
                                     '' Placeholder,