From 0950e04647717fe0ec2c4011658f60debc39f127 Mon Sep 17 00:00:00 2001 From: xiaochanghai Date: Thu, 28 Nov 2024 10:38:36 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=AE=89=E6=8E=92=E9=9D=A2?= =?UTF-8?q?=E8=AF=95=E8=A1=A8=E5=8D=95=E4=BF=A1=E6=81=AF=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E9=83=A8=E9=97=A8=E8=B4=9F=E8=B4=A3=E4=BA=BA?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Tiobon.Core.Api/Tiobon.Core.Model.xml | 30 +++++++++++++++++++ .../View/Ghrh/Ghrh_HumanRequest.Dto.View.cs | 25 ++++++++++++++++ .../Ghrh/Ghrh_HumanRequestServices.cs | 13 ++++++++ .../Ghrh/Ghrh_ResumeServices.cs | 20 ++++++------- Tiobon.Core/Tiobon.Core.Model.xml | 30 +++++++++++++++++++ 5 files changed, 108 insertions(+), 10 deletions(-) diff --git a/Tiobon.Core.Api/Tiobon.Core.Model.xml b/Tiobon.Core.Api/Tiobon.Core.Model.xml index 5ea55656..c76d1da8 100644 --- a/Tiobon.Core.Api/Tiobon.Core.Model.xml +++ b/Tiobon.Core.Api/Tiobon.Core.Model.xml @@ -22347,6 +22347,36 @@ 修改信息 + + + 申请部门 + + + + + 归属部门 + + + + + 岗位 + + + + + 职等 + + + + + 部门负责人ID + + + + + 部门负责人邮箱 + + 面试工单日志(Dto.View1) diff --git a/Tiobon.Core.Model/View/Ghrh/Ghrh_HumanRequest.Dto.View.cs b/Tiobon.Core.Model/View/Ghrh/Ghrh_HumanRequest.Dto.View.cs index ffca771b..451a3d2a 100644 --- a/Tiobon.Core.Model/View/Ghrh/Ghrh_HumanRequest.Dto.View.cs +++ b/Tiobon.Core.Model/View/Ghrh/Ghrh_HumanRequest.Dto.View.cs @@ -32,9 +32,34 @@ public class Ghrh_HumanRequestDto : Ghrh_HumanRequest /// public string UpdateDataInfo { get; set; } + /// + /// 申请部门 + /// public string ApplyDeptName { get; set; } + + /// + /// 归属部门 + /// public string BelongDeptName { get; set; } + + /// + /// 岗位 + /// public string TitleName { get; set; } + + /// + /// 职等 + /// public string GradeName { get; set; } + /// + /// 部门负责人ID + /// + public int? DeptManagerID { get; set; } + + /// + /// 部门负责人邮箱 + /// + public string DeptManagerEmail { get; set; } + } diff --git a/Tiobon.Core.Services/Ghrh/Ghrh_HumanRequestServices.cs b/Tiobon.Core.Services/Ghrh/Ghrh_HumanRequestServices.cs index 79a7abf4..91d9b102 100644 --- a/Tiobon.Core.Services/Ghrh/Ghrh_HumanRequestServices.cs +++ b/Tiobon.Core.Services/Ghrh/Ghrh_HumanRequestServices.cs @@ -75,6 +75,19 @@ public class Ghrh_HumanRequestServices : BaseServices().FirstAsync(o => result.ApplyDeptId == o.DeptID))?.DeptName; result.BelongDeptName = (await Db.Queryable().FirstAsync(o => result.BelongDeptId == o.DeptID))?.DeptName; result.TitleName = (await Db.Queryable().FirstAsync(o => result.TitleId == o.TitleID))?.TitleName; + + #region 返回部门负责人信息 + var dept = await Db.Queryable().Where(x => x.DeptID == result.BelongDeptId).FirstAsync(); + if (dept != null) + { + var staff = await Db.Queryable().Where(x => x.StaffID == dept.DeptManagerID).FirstAsync(); + if (staff != null) + { + result.DeptManagerID = staff.StaffID; + result.DeptManagerEmail = staff.Email; + } + } + #endregion return result; } } \ No newline at end of file diff --git a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs index 66ab45c7..1a473d8b 100644 --- a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs +++ b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs @@ -2353,16 +2353,16 @@ WHERE A.IsEnable = 1 AND C.IsEnable = 1"; } #region 返回部门负责人信息 - var dept = await Db.Queryable().Where(x => x.DeptID == order.HireDeptId).FirstAsync(); - if (dept != null) - { - var staff = await Db.Queryable().Where(x => x.StaffID == dept.DeptManagerID).FirstAsync(); - if (staff != null) - { - result.DeptManagerID = staff.StaffID; - result.DeptManagerEmail = staff.Email; - } - } + //var dept = await Db.Queryable().Where(x => x.DeptID == order.HireDeptId).FirstAsync(); + //if (dept != null) + //{ + // var staff = await Db.Queryable().Where(x => x.StaffID == dept.DeptManagerID).FirstAsync(); + // if (staff != null) + // { + // result.DeptManagerID = staff.StaffID; + // result.DeptManagerEmail = staff.Email; + // } + //} #endregion return ServiceResult.OprateSuccess("查询成功", result); diff --git a/Tiobon.Core/Tiobon.Core.Model.xml b/Tiobon.Core/Tiobon.Core.Model.xml index 5ea55656..c76d1da8 100644 --- a/Tiobon.Core/Tiobon.Core.Model.xml +++ b/Tiobon.Core/Tiobon.Core.Model.xml @@ -22347,6 +22347,36 @@ 修改信息 + + + 申请部门 + + + + + 归属部门 + + + + + 岗位 + + + + + 职等 + + + + + 部门负责人ID + + + + + 部门负责人邮箱 + + 面试工单日志(Dto.View1)