From 22f443f24ea48e8bf3940d0432f00edbb0a86c2f Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期四, 11 九月 2025 10:55:49 +0800
Subject: [PATCH] feat:开发

---
 FlexJobApi.UserServer.Application/UserResumes/Queries/UserResumeQueryHandler.cs |   29 +++++++++++++++++++++--------
 1 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/FlexJobApi.UserServer.Application/UserResumes/Queries/UserResumeQueryHandler.cs b/FlexJobApi.UserServer.Application/UserResumes/Queries/UserResumeQueryHandler.cs
index b80efa1..3c04b55 100644
--- a/FlexJobApi.UserServer.Application/UserResumes/Queries/UserResumeQueryHandler.cs
+++ b/FlexJobApi.UserServer.Application/UserResumes/Queries/UserResumeQueryHandler.cs
@@ -51,6 +51,7 @@
         /// <returns></returns>
         public async Task<GetUserResumesQueryResult> Handle(GetUserResumesQuery request, CancellationToken cancellationToken)
         {
+            Console.WriteLine(111);
             var logier = JwtUtils.GetCurrentLogier();
             var q = rep.AsQueryable().AsNoTracking()
                 .Where(it => it.Type == EnumUserType.Personal);
@@ -104,6 +105,9 @@
                 Gender = it.Gender,
                 IsReal = it.IsReal,
                 Age = it.Age,
+                ContactPhoneNumber = it.ContactPhoneNumber,
+                Identity = it.Identity,
+                RealTime = it.RealTime,
                 PersonalIdentityCode = it.PersonalIdentityCode,
                 PersonalIdentityContent = it.PersonalIdentity.Content,
                 EducationalBackgroundCode = it.EducationalBackgroundCode,
@@ -112,6 +116,13 @@
                 WorkSeniority = it.WorkSeniority,
                 WorkExperience = it.WorkExperience,
                 CreatedTime = it.CreatedTime,
+                HireStatus = request.TaskInfoId.HasValue
+                    ? it.EnterpriseEmployees
+                        .SelectMany(ee => ee.TaskInfoUsers)
+                        .Where(tu => tu.TaskInfoId == request.TaskInfoId)
+                        .Select(tu => tu.HireStatus as EnumTaskUserHireStatus?)
+                        .FirstOrDefault()
+                    : null
             });
             var result = await request.PageModel.GetPagedListAsync<GetUserResumesQueryResult, GetUserResumesQueryResultItem>(s, cancellationToken);
             return result;
@@ -126,17 +137,17 @@
         public async Task<GetUserResumeQueryResult> Handle(GetUserResumeQuery request, CancellationToken cancellationToken)
         {
             var logier = JwtUtils.GetCurrentLogier();
-            if (logier.Type == EnumUserType.Personal)
+            if (logier != null && logier.Type == EnumUserType.Personal)
             {
                 request.UserId = logier.Id;
             }
             EnterpriseEmployee? enterpriseEmployee = null;
-            if (logier.Type == EnumUserType.Enterprise && request.UserId == null && request.EnterpriseEmployeeId.HasValue)
+            if (logier != null && logier.Type == EnumUserType.Enterprise && request.UserId == null && request.EnterpriseEmployeeId.HasValue)
             {
                 enterpriseEmployee = await rep.Change<EnterpriseEmployee>().AsQueryable().AsNoTracking()
                    .Where(it => it.EnterpriseId == logier.EnterpriseId && it.Id == request.EnterpriseEmployeeId)
                    .FirstOrDefaultAsync(cancellationToken);
-                if (enterpriseEmployee == null) throw Oops.Oh(EnumErrorCodeType.s404, "璇ョ伒宸�");
+                if (enterpriseEmployee == null) throw Oops.Oh(EnumErrorCodeType.s404, "鐏靛伐");
                 request.UserId = enterpriseEmployee.UserId;
             }
             else if (request.UserId == null) throw Oops.Oh(EnumErrorCodeType.s400, "璇烽�夋嫨鐢ㄦ埛");
@@ -159,16 +170,18 @@
                     Age = enterpriseEmployee.Age,
                 };
             }
-            if (model == null) throw Oops.Oh(EnumErrorCodeType.s404, "璇ヤ俊鎭�");
+            if (model == null) throw Oops.Oh(EnumErrorCodeType.s404, "淇℃伅");
 
-            model.TaskInfoUsers = model.TaskInfoUsers.Where(it => it.SignContractTime.HasValue).ToList();
             if (model.Id.HasValue)
             {
                 model.TaskInfoUsers = repTaskInfoUser.AsQueryable().AsNoTracking()
-                    .Where(it => it.EnterpriseEmployee.UserId == model.Id && it.EnterpriseEmployee.EnterpriseSignContractTime.HasValue)
+                    .Where(it => 
+                        it.EnterpriseEmployee.UserId == model.Id 
+                        && it.HireStatus == EnumTaskUserHireStatus.Pass 
+                        && it.HireTime.HasValue)
                     .Select(it => new GetUserResumeQueryResultExperience
                     {
-                        SignContractTime = it.EnterpriseEmployee.EnterpriseSignContractTime,
+                        HireTime = it.HireTime,
                         EnterpriseName = it.TaskInfo.Enterprise.EnterpriseName,
                         Name = it.TaskInfo.Name
                     })
@@ -176,7 +189,7 @@
                 model.TaskCount = await repTaskInfoUser.AsQueryable().AsNoTracking()
                     .Where(it => it.EnterpriseEmployee.UserId == model.Id && it.HireStatus == EnumTaskUserHireStatus.Pass)
                     .CountAsync();
-                if (logier.Type == EnumUserType.Enterprise)
+                if (logier != null && logier.Type == EnumUserType.Enterprise)
                 {
                     model.IsCollected = await rep.Change<EnterpriseUserCollect>().AsQueryable().AsNoTracking()
                         .Where(it => it.EnterpriseId == logier.EnterpriseId && it.UserId == model.Id)

--
Gitblit v1.9.1