优化

Tiobon.Core.Api/Controllers/Ghrh/Ghrh_HumanRequestController.cs

@@ -11,4 +11,23 @@ public class Ghrh_HumanRequestController : BaseController<IGhrh_HumanRequestServ
     public Ghrh_HumanRequestController(IGhrh_HumanRequestServices service) : base(service)
     {
     }
+
+    #region 查询
+    /// <summary>
+    /// 根据条件查询数据
+    /// </summary>
+    /// <param name="body">条件</param>
+    /// <param name="status">status</param>
+    /// <returns></returns>
+    [HttpPost, Route("QueryList/{status}")]
+    public async Task<ServicePageResult<Ghrh_HumanRequestDto>> QueryByStatus([FromBody] QueryBody body, string status)
+    {
+        if (status == "Active")
+            return await _service.QueryFilterPage(body, $"(Status ='{status}' OR (WorkID IS NOT NULL AND WorkState IN (0,1)))");
+        else if (status == "Disable")
+            return await _service.QueryFilterPage(body, null, false);
+        else
+            return await _service.QueryFilterPage(body, $"Status ='{status}' AND WorkID IS NULL");
+    }
+    #endregion
 }

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

@@ -27772,6 +27772,11 @@
             年龄
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghrh_HumanRequestDto.ResumeTypeLabel">
+            <summary>
+            招聘类别
+            </summary>
+        </member>
         <member name="T:Tiobon.Core.Model.Models.Ghrh_HumanRequestDetailDto">
             <summary>
             人力需求维护明细(Dto.View1)

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

@@ -95,4 +95,9 @@ public class Ghrh_HumanRequestDto : Ghrh_HumanRequest
     /// 年龄
     /// </summary>
     public string AgeLabel { get; set; }
+    /// <summary>
+    /// 招聘类别
+    /// </summary>
+    public string ResumeTypeLabel { get; set; }
+    
 }

Tiobon.Core.Services/Ghrh/Ghrh_HumanRequestServices.cs

@@ -26,7 +26,8 @@ public class Ghrh_HumanRequestServices : BaseServices<Ghrh_HumanRequest, Ghrh_Hu
             x.InOrOutLabel = await GetParaLabel("ResumeBudgetTypr", x.InOrOut);
             x.ImportanceDegreeLabel = await GetParaLabel("ResumeImportanceDegree", x.ImportanceDegree);
             x.InTime1 = DateTimeHelper.ConvertToDayString(x.InTime);
-            x.AgeLabel = DateTimeHelper.ConvertToDayString(x.Age);
+            x.AgeLabel = await GetParaLabel("AgePeriodSetup", x.Age);
+            x.ResumeTypeLabel = await GetParaLabel("ResumeType", x.ResumeType);
             //x.AgeLabel = DateTimeHelper.ConvertToDayString(x.Age);
         }
     }
@@ -48,7 +49,7 @@ public class Ghrh_HumanRequestServices : BaseServices<Ghrh_HumanRequest, Ghrh_Hu
 
             entitys.ForEach(rule =>
             {
-                rule.ReportName = staffs.FirstOrDefault(o => rule.DeptId == o.DeptID)?.StaffName;
+                rule.ReportName = staffs.FirstOrDefault(o => rule.ReportId == o.StaffID)?.StaffName;
             });
         }
 

Tiobon.Core/Tiobon.Core.Model.xml

@@ -27772,6 +27772,11 @@
             年龄
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghrh_HumanRequestDto.ResumeTypeLabel">
+            <summary>
+            招聘类别
+            </summary>
+        </member>
         <member name="T:Tiobon.Core.Model.Models.Ghrh_HumanRequestDetailDto">
             <summary>
             人力需求维护明细(Dto.View1)