From 6684b5fe77d79a8f8fcc58195e6f1d87301079a1 Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期五, 15 八月 2025 15:56:06 +0800
Subject: [PATCH] fix:bug
---
FlexJobApi.UserServer.Application/EnterpriseEmployees/Queries/EnterpriseEmployeeQueryHandler.cs | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/FlexJobApi.UserServer.Application/EnterpriseEmployees/Queries/EnterpriseEmployeeQueryHandler.cs b/FlexJobApi.UserServer.Application/EnterpriseEmployees/Queries/EnterpriseEmployeeQueryHandler.cs
index f59f0f7..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)
{
@@ -80,18 +80,26 @@
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,
@@ -127,7 +135,7 @@
.Select(it => it.CreatedTime as DateTimeOffset?)
.FirstOrDefaultAsync(cancellationToken);
}
-
+
return model;
}
}
--
Gitblit v1.9.1