From fa61e2ee70365d2dd2eb59d834c0995c2fef46b8 Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期四, 14 八月 2025 14:34:21 +0800
Subject: [PATCH] feat:开发

---
 FlexJobApi.UserServer.Application/EnterpriseEmployees/Queries/EnterpriseEmployeeQueryHandler.cs |   19 ++++++++++++++-----
 1 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/FlexJobApi.UserServer.Application/EnterpriseEmployees/Queries/EnterpriseEmployeeQueryHandler.cs b/FlexJobApi.UserServer.Application/EnterpriseEmployees/Queries/EnterpriseEmployeeQueryHandler.cs
index 38e1ddc..e6f7c30 100644
--- a/FlexJobApi.UserServer.Application/EnterpriseEmployees/Queries/EnterpriseEmployeeQueryHandler.cs
+++ b/FlexJobApi.UserServer.Application/EnterpriseEmployees/Queries/EnterpriseEmployeeQueryHandler.cs
@@ -57,7 +57,7 @@
             }
             if (request.HireStatus.HasValue)
             {
-                q = q.Where(it => it.HireStatus == request.HireStatus);
+                q = q.Where(it => it.TaskInfoUsers.Any(tu => tu.HireStatus == request.HireStatus));
             }
             if (request.IsReal.HasValue)
             {
@@ -74,6 +74,7 @@
             var s = q.Select(it => new GetEnterpriseEmployeesQueryResultItem
             {
                 Id = it.Id,
+                Avatar = it.User.Avatar,
                 Name = it.Name,
                 Identity = it.Identity,
                 Gender = it.Gender,
@@ -85,12 +86,20 @@
                 PersonalIdentityContent = it.User.PersonalIdentity.Content,
                 EducationalBackgroundCode = it.User.EducationalBackgroundCode,
                 EducationalBackgroundContent = it.User.EducationalBackground.Content,
-                TaskCount = it.User.EnterpriseEmployees.Where(ee => ee.HireStatus == EnumTaskUserHireStatus.Pass).Sum(ee => ee.TaskInfoUsers.Count()),
+                TaskCount = it.User.EnterpriseEmployees.SelectMany(ee => ee.TaskInfoUsers).Count(tu => tu.HireStatus == EnumTaskUserHireStatus.Pass),
                 WorkSeniority = it.User.WorkSeniority,
                 WorkExperience = it.User.WorkExperience,
-                HireStatus = it.HireStatus,
+                HireStatus = it.TaskInfoUsers.Any(tu => tu.HireStatus == EnumTaskUserHireStatus.Pass)
+                    ? EnumTaskUserHireStatus.Pass
+                    : it.TaskInfoUsers.Any(tu => tu.HireStatus == EnumTaskUserHireStatus.Refuse)
+                    ? EnumTaskUserHireStatus.Refuse
+                    : EnumTaskUserHireStatus.Wait,
                 UserSignContractStatus = it.UserSignContractStatus,
-                HireTime = it.HireTime,
+                HireTime = it.TaskInfoUsers
+                    .OrderBy(tu => tu.HireTime)
+                    .Where(tu => tu.HireStatus == EnumTaskUserHireStatus.Pass && tu.HireTime.HasValue)
+                    .Select(tu => tu.HireTime)
+                    .FirstOrDefault(),
                 UserRealTime = it.User.RealTime,
                 UserSignContractTime = it.UserSignContractTime,
                 EnterpriseSignContractStatus = it.EnterpriseSignContractStatus,
@@ -126,7 +135,7 @@
                     .Select(it => it.CreatedTime as DateTimeOffset?)
                     .FirstOrDefaultAsync(cancellationToken);
             }
-            
+
             return model;
         }
     }

--
Gitblit v1.9.1