From 75ffff5b036f823c209702af154702f59b2efb7a Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期三, 13 八月 2025 18:15:50 +0800
Subject: [PATCH] feat:开发

---
 FlexJobApi.UserServer.Application/UserResumes/Queries/UserResumeQueryHandler.cs |   20 +++++++++++++-------
 1 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/FlexJobApi.UserServer.Application/UserResumes/Queries/UserResumeQueryHandler.cs b/FlexJobApi.UserServer.Application/UserResumes/Queries/UserResumeQueryHandler.cs
index f693340..e1f7ccf 100644
--- a/FlexJobApi.UserServer.Application/UserResumes/Queries/UserResumeQueryHandler.cs
+++ b/FlexJobApi.UserServer.Application/UserResumes/Queries/UserResumeQueryHandler.cs
@@ -30,7 +30,7 @@
         private readonly IRepository<User> rep = rep;
 
         /// <summary>
-        /// 鏌ヨ鐏靛伐鍒嗛〉鍒楄〃鏁版嵁
+        /// 鏌ヨ绠�鍘嗗垎椤靛垪琛ㄦ暟鎹�
         /// </summary>
         /// <param name="request"></param>
         /// <param name="cancellationToken"></param>
@@ -41,7 +41,7 @@
             var q = rep.AsQueryable().AsNoTracking();
             if (request.TaskInfoId.HasValue)
             {
-                q = q.Where(it => it.TaskInfoUsers.Any(tu => tu.TaskInfoId == request.TaskInfoId));
+                q = q.Where(it => it.EnterpriseEmployees.Any(ee => ee.TaskInfoUsers.Any(tu => tu.TaskInfoId == request.TaskInfoId)));
             }
             if (request.UserExpectJobs.IsNotNull())
             {
@@ -73,6 +73,14 @@
                     it.UserCredentials.Any(c =>
                         request.UserCredentials.Contains(c.TypeCode)));
             }
+            if (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)
+            {
+                q = q.Where(it => it.EnterpriseUserCollects.Any(c => c.EnterpriseId == logier.EnterpriseId && c.IsContacted));
+            }
             var s = q.Select(it => new GetUserResumesQueryResultItem
             {
                 Id = it.Id,
@@ -85,12 +93,10 @@
                 PersonalIdentityContent = it.PersonalIdentity.Content,
                 EducationalBackgroundCode = it.EducationalBackgroundCode,
                 EducationalBackgroundContent = it.EducationalBackground.Content,
-                TaskCount = it.TaskInfoUsers.Count(tu => tu.HireStatus == EnumTaskUserHireStatus.Pass),
+                TaskCount = it.EnterpriseEmployees.Where(ee => ee.HireStatus == EnumTaskUserHireStatus.Pass).Sum(ee => ee.TaskInfoUsers.Count()),
                 WorkSeniority = it.WorkSeniority,
                 WorkExperience = it.WorkExperience,
-                HireStatus = request.TaskInfoId.HasValue
-                    ? it.TaskInfoUsers.Where(it => it.TaskInfoId == request.TaskInfoId).Select(it => it.HireStatus as EnumTaskUserHireStatus?).FirstOrDefault()
-                    : null
+                CreatedTime = it.CreatedTime,
             });
             var result = await request.PageModel.GetPagedListAsync<GetUserResumesQueryResult, GetUserResumesQueryResultItem>(s, cancellationToken);
             return result;
@@ -115,7 +121,7 @@
                  .GetDetail<User, GetUserResumeQueryResult>(cancellationToken);
             model.TaskInfoUsers = model.TaskInfoUsers.Where(it => it.SignContractTime.HasValue).ToList();
             model.TaskCount = await rep.Change<TaskInfoUser>().AsQueryable().AsNoTracking()
-                .Where(it => it.UserId == model.Id && it.HireStatus == EnumTaskUserHireStatus.Pass)
+                .Where(it => it.EnterpriseEmployee.UserId == model.Id && it.EnterpriseEmployee.HireStatus == EnumTaskUserHireStatus.Pass)
                 .CountAsync();
             if (model.CityCode.IsNotNull())
             {

--
Gitblit v1.9.1