From 33b3aab9c26972d816ee41fa87059efa34e77a11 Mon Sep 17 00:00:00 2001 From: sunpengfei <i@angelzzz.com> Date: 星期四, 14 八月 2025 14:18:45 +0800 Subject: [PATCH] feat:开发 --- FlexJobApi.UserServer.Application/Users/Queries/GetPersonalUserInfosQueryHandler.cs | 45 ++++++++++++++++++++++++++++++++++++--------- 1 files changed, 36 insertions(+), 9 deletions(-) diff --git a/FlexJobApi.UserServer.Application/Users/Queries/GetPersonalUserInfosQueryHandler.cs b/FlexJobApi.UserServer.Application/Users/Queries/GetPersonalUserInfosQueryHandler.cs index 5ee6ff5..8f71df9 100644 --- a/FlexJobApi.UserServer.Application/Users/Queries/GetPersonalUserInfosQueryHandler.cs +++ b/FlexJobApi.UserServer.Application/Users/Queries/GetPersonalUserInfosQueryHandler.cs @@ -16,7 +16,8 @@ public class GetPersonalUserInfosQueryHandler( IRepository<User> rep ) : - IRequestHandler<GetPersonalUserInfosQuery, GetPersonalUserInfosQueryResult> + IRequestHandler<GetPersonalUserInfosQuery, GetPersonalUserInfosQueryResult>, + IRequestHandler<GetPersonalUserInfoSignContractsQuery, GetPersonalUserInfoSignContractsQueryResult> { private readonly IRepository<User> rep = rep; @@ -51,11 +52,7 @@ { q = q.Where(it => it.EnterpriseEmployees.Any(e => - e.UserSignContractStatus == EnumTaskUserSignContractStatus.Pass - && e.UserSignContractTime.HasValue - && request.SignContractBegin <= e.UserSignContractTime - && e.UserSignContractTime <= request.SignContractEnd - || e.EnterpriseSignContractStatus == EnumTaskUserSignContractStatus.Pass + e.EnterpriseSignContractStatus == EnumTaskUserSignContractStatus.Pass && e.EnterpriseSignContractTime.HasValue && request.SignContractBegin <= e.EnterpriseSignContractTime && e.EnterpriseSignContractTime <= request.SignContractEnd)); @@ -70,6 +67,8 @@ Name = it.Name, ContactPhoneNumber = it.ContactPhoneNumber, Identity = it.Identity, + IdentityImg = it.UserAuth.IdentityImg, + IdentityBackImg = it.UserAuth.IdentityBackImg, Gender = it.Gender, Age = it.Age, ProvinceCode = it.ProvinceCode, @@ -85,13 +84,41 @@ .Select(e => e.HireTime) .FirstOrDefault(), SignContractTime = it.EnterpriseEmployees - .OrderByDescending(e => e.EnterpriseSignContractTime > e.UserSignContractTime ? e.EnterpriseSignContractTime : e.UserSignContractTime) - .Where(e => e.HireStatus == EnumTaskUserHireStatus.Pass && e.HireTime.HasValue) - .Select(e => e.HireTime) + .OrderByDescending(e => e.EnterpriseSignContractTime) + .Where(e => e.EnterpriseSignContractStatus == EnumTaskUserSignContractStatus.Pass && e.EnterpriseSignContractTime.HasValue) + .Select(e => e.EnterpriseSignContractTime) .FirstOrDefault(), }); var result = await request.PageModel.GetPagedListAsync<GetPersonalUserInfosQueryResult, GetPersonalUserInfosQueryResultItem>(s, cancellationToken); return result; } + + /// <summary> + /// 鏌ヨC绔汉鍛樼绾﹁鎯呭垎椤靛垪琛ㄦ暟鎹� + /// </summary> + /// <param name="request"></param> + /// <param name="cancellationToken"></param> + /// <returns></returns> + public Task<GetPersonalUserInfoSignContractsQueryResult> Handle(GetPersonalUserInfoSignContractsQuery request, CancellationToken cancellationToken) + { + var q = rep.Change<EnterpriseEmployee>().AsQueryable().AsNoTracking() + .Where(it => it.UserId == request.Id) + .Select(it => new GetPersonalUserInfoSignContractsQueryResultItem + { + Id = it.Id, + EnterpriseName = it.Enterprise.EnterpriseName, + ApplyTime = it.TaskInfoUsers + .OrderBy(tu => tu.CreatedTime) + .Select(tu => tu.CreatedTime as DateTimeOffset?) + .FirstOrDefault(), + HireStatus = it.HireStatus, + HireTime = it.HireTime, + UserSignContractStatus = it.UserSignContractStatus, + EnterpriseSignContractStatus = it.EnterpriseSignContractStatus, + EnterpriseSignContractTime = it.EnterpriseSignContractTime, + ContractUrl = it.ContractUrl, + }); + return request.PageModel.GetPagedListAsync<GetPersonalUserInfoSignContractsQueryResult, GetPersonalUserInfoSignContractsQueryResultItem>(q, cancellationToken); + } } } -- Gitblit v1.9.1