From f7441ac8e0ef8778c4271d4ffec890a7e39bd3ab Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期五, 22 八月 2025 14:39:27 +0800
Subject: [PATCH] feat:开发
---
FlexJobApi.UserServer.Application/Users/Queries/GetPersonalUserInfosQueryHandler.cs | 31 ++++++++++++++++++++++---------
1 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/FlexJobApi.UserServer.Application/Users/Queries/GetPersonalUserInfosQueryHandler.cs b/FlexJobApi.UserServer.Application/Users/Queries/GetPersonalUserInfosQueryHandler.cs
index 8f71df9..b76c492 100644
--- a/FlexJobApi.UserServer.Application/Users/Queries/GetPersonalUserInfosQueryHandler.cs
+++ b/FlexJobApi.UserServer.Application/Users/Queries/GetPersonalUserInfosQueryHandler.cs
@@ -30,7 +30,8 @@
public async Task<GetPersonalUserInfosQueryResult> Handle(GetPersonalUserInfosQuery 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.Keywords.IsNotNull())
{
q = q.Where(it =>
@@ -42,11 +43,11 @@
if (request.HireTimeBegin.HasValue && request.HireTimeEnd.HasValue)
{
q = q.Where(it =>
- it.EnterpriseEmployees.Any(e =>
- e.HireStatus == EnumTaskUserHireStatus.Pass
- && e.HireTime.HasValue
- && request.HireTimeBegin <= e.HireTime
- && e.HireTime <= request.HireTimeEnd));
+ it.EnterpriseEmployees.SelectMany(ee => ee.TaskInfoUsers).Any(tu =>
+ tu.HireStatus == EnumTaskUserHireStatus.Pass
+ && tu.HireTime.HasValue
+ && request.HireTimeBegin <= tu.HireTime
+ && tu.HireTime <= request.HireTimeEnd));
}
if (request.SignContractBegin.HasValue && request.SignContractEnd.HasValue)
{
@@ -79,6 +80,7 @@
IsReal = it.IsReal,
RealTime = it.RealTime,
HireTime = it.EnterpriseEmployees
+ .SelectMany(ee => ee.TaskInfoUsers)
.OrderByDescending(e => e.HireTime)
.Where(e => e.HireStatus == EnumTaskUserHireStatus.Pass && e.HireTime.HasValue)
.Select(e => e.HireTime)
@@ -111,12 +113,23 @@
.OrderBy(tu => tu.CreatedTime)
.Select(tu => tu.CreatedTime as DateTimeOffset?)
.FirstOrDefault(),
- HireStatus = it.HireStatus,
- HireTime = it.HireTime,
+ HireStatus = it.TaskInfoUsers.Any(tu => tu.HireStatus == EnumTaskUserHireStatus.Pass)
+ ? EnumTaskUserHireStatus.Pass
+ : it.TaskInfoUsers.Any(tu => tu.HireStatus == EnumTaskUserHireStatus.Refuse)
+ ? EnumTaskUserHireStatus.Refuse
+ : EnumTaskUserHireStatus.Wait,
+ HireTime = it.TaskInfoUsers
+ .OrderBy(tu => tu.HireTime)
+ .Where(tu => tu.HireStatus == EnumTaskUserHireStatus.Pass && tu.HireTime.HasValue)
+ .Select(tu => tu.HireTime)
+ .FirstOrDefault(),
UserSignContractStatus = it.UserSignContractStatus,
EnterpriseSignContractStatus = it.EnterpriseSignContractStatus,
EnterpriseSignContractTime = it.EnterpriseSignContractTime,
- ContractUrl = it.ContractUrl,
+ ContractUrl = it.Contracts
+ .Where(c => c.EnterpriseSignContractStatus == it.EnterpriseSignContractStatus)
+ .Select(c => c.Url)
+ .FirstOrDefault(),
});
return request.PageModel.GetPagedListAsync<GetPersonalUserInfoSignContractsQueryResult, GetPersonalUserInfoSignContractsQueryResultItem>(q, cancellationToken);
}
--
Gitblit v1.9.1