From e94d90fd7d2ec6fcb41fb6aa6fc28e3f9d39ba95 Mon Sep 17 00:00:00 2001 From: sunpengfei <i@angelzzz.com> Date: 星期二, 19 八月 2025 10:50:16 +0800 Subject: [PATCH] feat:开发 --- FlexJobApi.UserServer.Application/EnterpriseEmployees/Queries/EnterpriseEmployeeQueryHandler.cs | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-) diff --git a/FlexJobApi.UserServer.Application/EnterpriseEmployees/Queries/EnterpriseEmployeeQueryHandler.cs b/FlexJobApi.UserServer.Application/EnterpriseEmployees/Queries/EnterpriseEmployeeQueryHandler.cs index 38e1ddc..98fea13 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,23 +74,32 @@ var s = q.Select(it => new GetEnterpriseEmployeesQueryResultItem { Id = it.Id, + Avatar = it.User.Avatar, Name = it.Name, Identity = it.Identity, Gender = it.Gender, Age = it.Age, ContactPhoneNumber = it.ContactPhoneNumber, - UserIsReal = it.User.IsReal, + UserIsReal = it.User.IsReal == true, RealMethod = it.User.RealMethod, PersonalIdentityCode = it.User.PersonalIdentityCode, 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