From 173a8e6a757e8c7c324d5d00cd1ec90d0f13d281 Mon Sep 17 00:00:00 2001 From: sunpengfei <i@angelzzz.com> Date: 星期四, 14 八月 2025 18:55:48 +0800 Subject: [PATCH] feat:开发 --- FlexJobApi.UserServer.Application/UserResumes/Queries/UserResumeQueryHandler.cs | 46 +++++++++++++++++++++++++++++++++++++++------- 1 files changed, 39 insertions(+), 7 deletions(-) diff --git a/FlexJobApi.UserServer.Application/UserResumes/Queries/UserResumeQueryHandler.cs b/FlexJobApi.UserServer.Application/UserResumes/Queries/UserResumeQueryHandler.cs index 995e92e..fee6623 100644 --- a/FlexJobApi.UserServer.Application/UserResumes/Queries/UserResumeQueryHandler.cs +++ b/FlexJobApi.UserServer.Application/UserResumes/Queries/UserResumeQueryHandler.cs @@ -16,8 +16,10 @@ /// 鐢ㄦ埛绠�鍘嗘煡璇㈠鐞嗗櫒 /// </summary> public class UserResumeQueryHandler( - IRepository<User> rep + IRepository<User> rep, + IRepository<TaskInfoUser> repTaskInfoUser ) : + IRequestHandler<GetOpenUserResumesQuery, GetUserResumesQueryResult>, IRequestHandler<GetUserResumesQuery, GetUserResumesQueryResult>, IRequestHandler<GetUserResumeQuery, GetUserResumeQueryResult>, IRequestHandler<GetUserResumePersonalQuery, GetUserResumePersonalQueryResult>, @@ -28,6 +30,18 @@ IRequestHandler<GetUserResumeDetailQuery, GetUserResumeDetailQueryResult> { private readonly IRepository<User> rep = rep; + private readonly IRepository<TaskInfoUser> repTaskInfoUser = repTaskInfoUser; + + /// <summary> + /// 鏌ヨ寮�鏀剧畝鍘嗗垎椤靛垪琛ㄦ暟鎹� + /// </summary> + /// <param name="request"></param> + /// <param name="cancellationToken"></param> + /// <returns></returns> + public Task<GetUserResumesQueryResult> Handle(GetOpenUserResumesQuery request, CancellationToken cancellationToken) + { + return Handle(request.Adapt<GetUserResumesQuery>(), cancellationToken); + } /// <summary> /// 鏌ヨ绠�鍘嗗垎椤靛垪琛ㄦ暟鎹� @@ -38,7 +52,8 @@ public async Task<GetUserResumesQueryResult> Handle(GetUserResumesQuery 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.TaskInfoId.HasValue) { q = q.Where(it => it.EnterpriseEmployees.Any(ee => ee.TaskInfoUsers.Any(tu => tu.TaskInfoId == request.TaskInfoId))); @@ -73,11 +88,11 @@ it.UserCredentials.Any(c => request.UserCredentials.Contains(c.TypeCode))); } - if (logier.Type == EnumUserType.Enterprise && request.IsCollected == true) + if (logier != null && logier.Type == EnumUserType.Enterprise && request.IsCollected == true) { q = q.Where(it => it.EnterpriseUserCollects.Any(c => c.EnterpriseId == logier.EnterpriseId && c.IsCollected)); } - if (logier.Type == EnumUserType.Enterprise && request.IsContacted == true) + if (logier != null && logier.Type == EnumUserType.Enterprise && request.IsContacted == true) { q = q.Where(it => it.EnterpriseUserCollects.Any(c => c.EnterpriseId == logier.EnterpriseId && c.IsContacted)); } @@ -93,10 +108,17 @@ PersonalIdentityContent = it.PersonalIdentity.Content, EducationalBackgroundCode = it.EducationalBackgroundCode, EducationalBackgroundContent = it.EducationalBackground.Content, - TaskCount = it.EnterpriseEmployees.Where(ee => ee.HireStatus == EnumTaskUserHireStatus.Pass).Sum(ee => ee.TaskInfoUsers.Count()), + TaskCount = it.EnterpriseEmployees.SelectMany(ee => ee.TaskInfoUsers).Count(tu => tu.HireStatus == EnumTaskUserHireStatus.Pass), WorkSeniority = it.WorkSeniority, WorkExperience = it.WorkExperience, CreatedTime = it.CreatedTime, + HireStatus = request.TaskInfoId.HasValue + ? it.EnterpriseEmployees + .SelectMany(ee => ee.TaskInfoUsers) + .Where(tu => tu.TaskInfoId == request.TaskInfoId) + .Select(tu => tu.HireStatus as EnumTaskUserHireStatus?) + .FirstOrDefault() + : null }); var result = await request.PageModel.GetPagedListAsync<GetUserResumesQueryResult, GetUserResumesQueryResultItem>(s, cancellationToken); return result; @@ -145,11 +167,21 @@ }; } if (model == null) throw Oops.Oh(EnumErrorCodeType.s404, "璇ヤ俊鎭�"); + model.TaskInfoUsers = model.TaskInfoUsers.Where(it => it.SignContractTime.HasValue).ToList(); if (model.Id.HasValue) { - model.TaskCount = await rep.Change<TaskInfoUser>().AsQueryable().AsNoTracking() - .Where(it => it.EnterpriseEmployee.UserId == model.Id && it.EnterpriseEmployee.HireStatus == EnumTaskUserHireStatus.Pass) + model.TaskInfoUsers = repTaskInfoUser.AsQueryable().AsNoTracking() + .Where(it => it.EnterpriseEmployee.UserId == model.Id && it.EnterpriseEmployee.EnterpriseSignContractTime.HasValue) + .Select(it => new GetUserResumeQueryResultExperience + { + SignContractTime = it.EnterpriseEmployee.EnterpriseSignContractTime, + EnterpriseName = it.TaskInfo.Enterprise.EnterpriseName, + Name = it.TaskInfo.Name + }) + .ToList(); + model.TaskCount = await repTaskInfoUser.AsQueryable().AsNoTracking() + .Where(it => it.EnterpriseEmployee.UserId == model.Id && it.HireStatus == EnumTaskUserHireStatus.Pass) .CountAsync(); if (logier.Type == EnumUserType.Enterprise) { -- Gitblit v1.9.1