From 313c3132dcd1768df34e3717544df9e0e9d36514 Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期五, 15 八月 2025 14:44:53 +0800
Subject: [PATCH] feat:开发

---
 FlexJobApi.UserServer.Application/UserResumes/Queries/UserResumeQueryHandler.cs |   30 +++++++++++++++++++++++++-----
 1 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/FlexJobApi.UserServer.Application/UserResumes/Queries/UserResumeQueryHandler.cs b/FlexJobApi.UserServer.Application/UserResumes/Queries/UserResumeQueryHandler.cs
index 5a9469e..aeae21b 100644
--- a/FlexJobApi.UserServer.Application/UserResumes/Queries/UserResumeQueryHandler.cs
+++ b/FlexJobApi.UserServer.Application/UserResumes/Queries/UserResumeQueryHandler.cs
@@ -19,6 +19,7 @@
             IRepository<User> rep,
             IRepository<TaskInfoUser> repTaskInfoUser
         ) :
+        IRequestHandler<GetOpenUserResumesQuery, GetUserResumesQueryResult>,
         IRequestHandler<GetUserResumesQuery, GetUserResumesQueryResult>,
         IRequestHandler<GetUserResumeQuery, GetUserResumeQueryResult>,
         IRequestHandler<GetUserResumePersonalQuery, GetUserResumePersonalQueryResult>,
@@ -32,6 +33,17 @@
         private readonly IRepository<TaskInfoUser> repTaskInfoUser = repTaskInfoUser;
 
         /// <summary>
+        /// 鏌ヨ寮�鏀剧畝鍘嗗垎椤靛垪琛ㄦ暟鎹�
+        /// </summary>
+        /// <param name="request"></param>
+        /// <param name="cancellationToken"></param>
+        /// <returns></returns>
+        public Task<GetUserResumesQueryResult> Handle(GetOpenUserResumesQuery request, CancellationToken cancellationToken)
+        {
+            return Handle(request.Adapt<GetUserResumesQuery>(), cancellationToken);
+        }
+
+        /// <summary>
         /// 鏌ヨ绠�鍘嗗垎椤靛垪琛ㄦ暟鎹�
         /// </summary>
         /// <param name="request"></param>
@@ -40,7 +52,8 @@
         public async Task<GetUserResumesQueryResult> Handle(GetUserResumesQuery request, CancellationToken cancellationToken)
         {
             var logier = JwtUtils.GetCurrentLogier();
-            var q = rep.AsQueryable().AsNoTracking();
+            var q = rep.AsQueryable().AsNoTracking()
+                .Where(it => it.Type == EnumUserType.Personal);
             if (request.TaskInfoId.HasValue)
             {
                 q = q.Where(it => it.EnterpriseEmployees.Any(ee => ee.TaskInfoUsers.Any(tu => tu.TaskInfoId == request.TaskInfoId)));
@@ -75,11 +88,11 @@
                     it.UserCredentials.Any(c =>
                         request.UserCredentials.Contains(c.TypeCode)));
             }
-            if (logier.Type == EnumUserType.Enterprise && request.IsCollected == true)
+            if (logier != null && logier.Type == EnumUserType.Enterprise && request.IsCollected == true)
             {
                 q = q.Where(it => it.EnterpriseUserCollects.Any(c => c.EnterpriseId == logier.EnterpriseId && c.IsCollected));
             }
-            if (logier.Type == EnumUserType.Enterprise && request.IsContacted == true)
+            if (logier != null && logier.Type == EnumUserType.Enterprise && request.IsContacted == true)
             {
                 q = q.Where(it => it.EnterpriseUserCollects.Any(c => c.EnterpriseId == logier.EnterpriseId && c.IsContacted));
             }
@@ -99,6 +112,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;
@@ -123,7 +143,7 @@
                 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, "璇烽�夋嫨鐢ㄦ埛");
@@ -146,7 +166,7 @@
                     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)

--
Gitblit v1.9.1