简历操作日志新增记录员工信息

Tiobon.Core.Api/Controllers/Authorize/AuthorizeController.cs

@@ -278,14 +278,17 @@ public class AuthorizeController : BaseApiController
 
         try
         {
-            var user = await _ghrs_UserServices.Query(d => d.UserId == Id);
+            var user = await _ghrs_UserServices.QuerySingleDto(d => d.UserId == Id);
-            if (user.Count > 0)
+            if (user != null)
             {
                 //如果是基于用户的授权策略，这里要添加用户;如果是基于角色的授权策略，这里要添加角色
                 var claims = new List<Claim> {
-                new Claim(ClaimTypes.Name,  user.FirstOrDefault().UserName.ToString()),
+                new Claim(ClaimTypes.Name,  user.UserName.ToString()),
-                new Claim(JwtRegisteredClaimNames.Jti, user.FirstOrDefault().UserId.ToString()),
+                new Claim(JwtRegisteredClaimNames.Jti, user.UserId.ToString()),
                 new Claim("TenantId", "0"),
+                new Claim("StaffId", user.UserStaffID.ToString()),
+                new Claim("StaffName",user.StaffName),
+                new Claim("StaffNo", user.StaffNo),
                 new Claim(JwtRegisteredClaimNames.Iat, DateTime.Now.DateToTimeStamp()),
                 new Claim(ClaimTypes.Expiration, DateTime.Now.AddSeconds(_requirement.Expiration.TotalSeconds).ToString())
                 };

Tiobon.Core.Api/Controllers/CommonController.cs

@@ -1,7 +1,5 @@
-using Confluent.Kafka;
+using Newtonsoft.Json.Linq;
-using Newtonsoft.Json.Linq;
 using System.Data;
-using System.Net;
 using Tiobon.Core.Common.DB.Dapper;
 using Tiobon.Core.Common.DB.Dapper.DBManager;
 

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

@@ -7400,6 +7400,16 @@
             简历ID
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghrh_InterviewLogBase.StaffId">
+            <summary>
+            员工ID
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghrh_InterviewLogBase.StaffName">
+            <summary>
+            员工名称
+            </summary>
+        </member>
         <member name="P:Tiobon.Core.Model.Models.Ghrh_InterviewLogBase.UserId">
             <summary>
             用户ID
@@ -20901,6 +20911,16 @@
             简历ID
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghrh_InterviewLog.StaffId">
+            <summary>
+            员工ID
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghrh_InterviewLog.StaffName">
+            <summary>
+            员工名称
+            </summary>
+        </member>
         <member name="P:Tiobon.Core.Model.Models.Ghrh_InterviewLog.UserId">
             <summary>
             用户ID

Tiobon.Core.Api/Tiobon.Core.xml

@@ -1563,7 +1563,7 @@
         </member>
         <member name="M:Tiobon.Core.Api.Controllers.Ghrh_ResumeController.ApplyOfferApproval(System.Collections.Generic.List{System.Int64})">
             <summary>
-            发起录用审批
+            转入待发Offer
             </summary> 
             <param name="ids">简历ID</param> 
             <returns></returns> 

Tiobon.Core.Common/HttpContextUser/AspNetUser.cs

@@ -1,8 +1,7 @@
-using System.IdentityModel.Tokens.Jwt;
+using Microsoft.AspNetCore.Http;
-using System.Security.Claims;
-using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Logging;
-using Newtonsoft.Json;
+using System.IdentityModel.Tokens.Jwt;
+using System.Security.Claims;
 using Tiobon.Core.Common.Swagger;
 using Tiobon.Core.Model;
 
@@ -146,4 +145,24 @@ public class AspNetUser : IUser
                 where item.Type == ClaimType
                 select item.Value).ToList();
     }
+
+    public string StaffNo => GetStaffNo();
+
+    private string GetStaffNo()
+    {
+        return GetClaimValueByType("StaffNo").FirstOrDefault(); ;
+    }
+
+    public string StaffName => GetStaffName();
+
+    private string GetStaffName()
+    {
+        return GetClaimValueByType("StaffName").FirstOrDefault();
+    }
+    public int StaffId => GetStaffId();
+
+    private int GetStaffId()
+    {
+        return GetClaimValueByType("StaffId").FirstOrDefault().ObjToInt();
+    }
 }

Tiobon.Core.Common/HttpContextUser/IUser.cs

@@ -9,6 +9,12 @@ public interface IUser
     int ID { get; }
     long TenantId { get; }
     bool IsAuthenticated();
+    int StaffId { get; }
+
+    string StaffName { get; }
+
+    string StaffNo { get; }
+
     IEnumerable<Claim> GetClaimsIdentity();
     List<string> GetClaimValueByType(string ClaimType);
 

Tiobon.Core.Model/Base/Ghrh/Ghrh_InterviewLog.Dto.Base.cs

@@ -6,7 +6,7 @@
 *
 * Ver    变更日期 负责人  变更内容
 * ───────────────────────────────────
-*V0.01  2024/12/13 14:18:56  SimonHsiao   初版
+*V0.01  2024/12/17 17:31:46  SimonHsiao   初版
 *
 * Copyright(c) 2024 Tiobon Corporation. All Rights Reserved.
 *┌──────────────────────────────────┐
@@ -38,6 +38,17 @@ public class Ghrh_InterviewLogBase
     /// </summary>
     public long? ResumeId { get; set; }
 
+    /// <summary>
+    /// 员工ID
+    /// </summary>
+    public int? StaffId { get; set; }
+
+    /// <summary>
+    /// 员工名称
+    /// </summary>
+    [Display(Name = "StaffName"), Description("员工名称"), MaxLength(32, ErrorMessage = "员工名称 不能超过 32 个字符")]
+    public string StaffName { get; set; }
+
     /// <summary>
     /// 用户ID
     /// </summary>

Tiobon.Core.Model/Models/Ghrh/Ghrh_InterviewLog.cs

@@ -6,7 +6,7 @@
 *
 * Ver    变更日期 负责人  变更内容
 * ───────────────────────────────────
-*V0.01  2024/12/13 14:18:56  SimonHsiao   初版
+*V0.01  2024/12/17 17:31:46  SimonHsiao   初版
 *
 * Copyright(c) 2024 Tiobon Corporation. All Rights Reserved.
 *┌──────────────────────────────────┐
@@ -39,6 +39,17 @@ public class Ghrh_InterviewLog : BasePoco
     /// </summary>
     public long? ResumeId { get; set; }
 
+    /// <summary>
+    /// 员工ID
+    /// </summary>
+    public int? StaffId { get; set; }
+
+    /// <summary>
+    /// 员工名称
+    /// </summary>
+    [Display(Name = "StaffName"), Description("员工名称"), MaxLength(32, ErrorMessage = "员工名称 不能超过 32 个字符")]
+    public string StaffName { get; set; }
+
     /// <summary>
     /// 用户ID
     /// </summary>

Tiobon.Core.Model/View/Ghrs/Ghrs_User.Dto.View.cs

@@ -23,4 +23,9 @@ namespace Tiobon.Core.Model.Models;
 /// </summary>
 public class Ghrs_UserDto : Ghrs_User
 {
+
+    public string StaffNo { get; set; }
+
+
+    public string StaffName { get; set; }
 }

Tiobon.Core.Services/BASE/BaseServices.cs

@@ -582,7 +582,7 @@ public class BaseServices<TEntity, TEntityDto, TInsertDto, TEditDto> : IBaseServ
             return default;
         else return entity;
     }
-    public async Task<TEntityDto> QuerySingleDto(Expression<Func<TEntity, bool>> whereExpression)
+    public virtual async Task<TEntityDto> QuerySingleDto(Expression<Func<TEntity, bool>> whereExpression)
     {
         var entity = await QuerySingle(whereExpression);
         if (entity == null)

Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs

@@ -2,6 +2,7 @@
 using DinkToPdf.Contracts;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Hosting;
+using NPOI.OpenXmlFormats.Wordprocessing;
 using System.IO.Compression;
 using static Tiobon.Core.Model.Consts;
 
@@ -2265,6 +2266,8 @@ END";
         {
             InterviewOrderId = order.Id,
             ResumeId = id,
+            StaffId = App.User.StaffId,
+            StaffName = App.User.StaffName + "（" + App.User.StaffNo + "）",
             Source = "SendOffer",
             Reverse1 = entity.OfferFileUrl,
             UserId = App.User.ID,
@@ -3678,6 +3681,8 @@ WHERE A.IsEnable = 1 AND C.IsEnable = 1 AND C.Status = A.Status";
         {
             InterviewOrderId = orderId,
             InterviewRecordId = recordId,
+            StaffId = App.User.StaffId,
+            StaffName = App.User.StaffName + "（" + App.User.StaffNo + "）",
             ResumeId = resumeId,
             Source = source,
             UserId = App.User.ID,

Tiobon.Core.Services/Ghrs/Ghrs_UserServices.cs

@@ -11,4 +11,22 @@ public class Ghrs_UserServices : BaseServices<Ghrs_User, Ghrs_UserDto, InsertGhr
         this._dal = dal;
         base.BaseDal = dal;
     }
+
+    public override async Task<Ghrs_UserDto> QuerySingleDto(Expression<Func<Ghrs_User, bool>> whereExpression)
+    {
+
+        var entity = await base.QuerySingleDto(whereExpression);
+
+        if (entity != null)
+        {
+            var staff = await Db.Queryable<Ghra_Staff>().Where(x => x.StaffID == entity.UserStaffID).FirstAsync();
+            if (staff != null)
+            {
+                entity.StaffNo = staff.StaffNo;
+                entity.StaffName = staff.StaffName;
+            }
+        }
+
+        return entity;
+    }
 }