From 33094ef9585fd742689607621d8bbf0cd8e60da6 Mon Sep 17 00:00:00 2001 From: sunpengfei <i@angelzzz.com> Date: 星期五, 05 九月 2025 10:25:21 +0800 Subject: [PATCH] feat:开发 --- FlexJobApi.UserServer.Application/UserResumes/Queries/UserResumeQueryHandler.cs | 64 +++++++++++++++++++++++++------ 1 files changed, 51 insertions(+), 13 deletions(-) diff --git a/FlexJobApi.UserServer.Application/UserResumes/Queries/UserResumeQueryHandler.cs b/FlexJobApi.UserServer.Application/UserResumes/Queries/UserResumeQueryHandler.cs index 995e92e..3c04b55 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> /// 鏌ヨ绠�鍘嗗垎椤靛垪琛ㄦ暟鎹� @@ -37,8 +51,10 @@ /// <returns></returns> public async Task<GetUserResumesQueryResult> Handle(GetUserResumesQuery request, CancellationToken cancellationToken) { + Console.WriteLine(111); 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 +89,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)); } @@ -89,14 +105,24 @@ Gender = it.Gender, IsReal = it.IsReal, Age = it.Age, + ContactPhoneNumber = it.ContactPhoneNumber, + Identity = it.Identity, + RealTime = it.RealTime, PersonalIdentityCode = it.PersonalIdentityCode, 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; @@ -111,17 +137,17 @@ public async Task<GetUserResumeQueryResult> Handle(GetUserResumeQuery request, CancellationToken cancellationToken) { var logier = JwtUtils.GetCurrentLogier(); - if (logier.Type == EnumUserType.Personal) + if (logier != null && logier.Type == EnumUserType.Personal) { request.UserId = logier.Id; } EnterpriseEmployee? enterpriseEmployee = null; - if (logier.Type == EnumUserType.Enterprise && request.UserId == null && request.EnterpriseEmployeeId.HasValue) + if (logier != null && logier.Type == EnumUserType.Enterprise && request.UserId == null && request.EnterpriseEmployeeId.HasValue) { enterpriseEmployee = await rep.Change<EnterpriseEmployee>().AsQueryable().AsNoTracking() .Where(it => it.EnterpriseId == logier.EnterpriseId && it.Id == request.EnterpriseEmployeeId) .FirstOrDefaultAsync(cancellationToken); - if (enterpriseEmployee == null) throw Oops.Oh(EnumErrorCodeType.s404, "璇ョ伒宸�"); + if (enterpriseEmployee == null) throw Oops.Oh(EnumErrorCodeType.s404, "鐏靛伐"); request.UserId = enterpriseEmployee.UserId; } else if (request.UserId == null) throw Oops.Oh(EnumErrorCodeType.s400, "璇烽�夋嫨鐢ㄦ埛"); @@ -144,14 +170,26 @@ Age = enterpriseEmployee.Age, }; } - if (model == null) throw Oops.Oh(EnumErrorCodeType.s404, "璇ヤ俊鎭�"); - model.TaskInfoUsers = model.TaskInfoUsers.Where(it => it.SignContractTime.HasValue).ToList(); + if (model == null) throw Oops.Oh(EnumErrorCodeType.s404, "淇℃伅"); + 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.HireStatus == EnumTaskUserHireStatus.Pass + && it.HireTime.HasValue) + .Select(it => new GetUserResumeQueryResultExperience + { + HireTime = it.HireTime, + 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) + if (logier != null && logier.Type == EnumUserType.Enterprise) { model.IsCollected = await rep.Change<EnterpriseUserCollect>().AsQueryable().AsNoTracking() .Where(it => it.EnterpriseId == logier.EnterpriseId && it.UserId == model.Id) -- Gitblit v1.9.1