From d19b0883b817ca98cfcb872f2d6047c20fffc8d4 Mon Sep 17 00:00:00 2001 From: sunpengfei <i@angelzzz.com> Date: 星期五, 22 八月 2025 14:20:20 +0800 Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/ApiFlexJob --- FlexJobApi.UserServer.Application/UserResumes/Queries/UserResumeQueryHandler.cs | 215 +++++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 182 insertions(+), 33 deletions(-) diff --git a/FlexJobApi.UserServer.Application/UserResumes/Queries/UserResumeQueryHandler.cs b/FlexJobApi.UserServer.Application/UserResumes/Queries/UserResumeQueryHandler.cs index 9c8ddd9..3c04b55 100644 --- a/FlexJobApi.UserServer.Application/UserResumes/Queries/UserResumeQueryHandler.cs +++ b/FlexJobApi.UserServer.Application/UserResumes/Queries/UserResumeQueryHandler.cs @@ -16,8 +16,11 @@ /// 鐢ㄦ埛绠�鍘嗘煡璇㈠鐞嗗櫒 /// </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>, IRequestHandler<GetUserResumeJobSeekingQuery, GetUserResumeJobSeekingQueryResult>, @@ -27,6 +30,103 @@ 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> + /// 鏌ヨ绠�鍘嗗垎椤靛垪琛ㄦ暟鎹� + /// </summary> + /// <param name="request"></param> + /// <param name="cancellationToken"></param> + /// <returns></returns> + public async Task<GetUserResumesQueryResult> Handle(GetUserResumesQuery request, CancellationToken cancellationToken) + { + Console.WriteLine(111); + var logier = JwtUtils.GetCurrentLogier(); + 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))); + } + if (request.UserExpectJobs.IsNotNull()) + { + q = q.Where(it => + it.UserExpectJobs.Any(j => + request.UserExpectJobs.Contains(j.ExpectJobCode) + || j.ExpectJob.ParentId.HasValue + && (request.UserExpectJobs.Contains(j.ExpectJob.Parent.Code)))); + } + if (request.Gender.HasValue) + { + q = q.Where(it => it.Gender == request.Gender); + } + if (request.PersonalIdentityCode.IsNotNull()) + { + q = q.Where(it => it.PersonalIdentityCode == request.PersonalIdentityCode); + } + if (request.AgeMin.HasValue) + { + q = q.Where(it => it.Age >= request.AgeMin); + } + if (request.AgeMax.HasValue) + { + q = q.Where(it => it.Age <= request.AgeMax); + } + if (request.UserCredentials.IsNotNull()) + { + q = q.Where(it => + it.UserCredentials.Any(c => + request.UserCredentials.Contains(c.TypeCode))); + } + 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 != null && logier.Type == EnumUserType.Enterprise && request.IsContacted == true) + { + q = q.Where(it => it.EnterpriseUserCollects.Any(c => c.EnterpriseId == logier.EnterpriseId && c.IsContacted)); + } + var s = q.Select(it => new GetUserResumesQueryResultItem + { + Id = it.Id, + Avatar = it.Avatar, + Name = it.Name, + 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.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; + } /// <summary> /// 鏌ヨ鐢ㄦ埛绠�鍘� @@ -37,16 +137,87 @@ 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; } - if (request.UserId == null) throw Oops.Oh(EnumErrorCodeType.s400, "璇烽�夋嫨鐢ㄦ埛"); - var model = await request.UserId.Value - .GetDetail<User, GetUserResumeQueryResult>(cancellationToken); - model.TaskCount = await rep.Change<TaskInfoUser>().AsQueryable().AsNoTracking() - .Where(it => it.UserId == model.Id && it.HireStatus == EnumTaskUserHireStatus.Pass) - .CountAsync(); + EnterpriseEmployee? enterpriseEmployee = null; + 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, "鐏靛伐"); + request.UserId = enterpriseEmployee.UserId; + } + else if (request.UserId == null) throw Oops.Oh(EnumErrorCodeType.s400, "璇烽�夋嫨鐢ㄦ埛"); + + GetUserResumeQueryResult? model = null; + if (request.UserId.HasValue) + { + model = await rep.AsQueryable().AsNoTracking() + .Where(it => it.Id == request.UserId) + .GetDetail<User, GetUserResumeQueryResult>(cancellationToken); + } + else if (enterpriseEmployee != null) + { + model = new GetUserResumeQueryResult + { + Name = enterpriseEmployee.Name, + ContactPhoneNumber = enterpriseEmployee.ContactPhoneNumber, + Identity = enterpriseEmployee.Identity, + Gender = enterpriseEmployee.Gender, + Age = enterpriseEmployee.Age, + }; + } + if (model == null) throw Oops.Oh(EnumErrorCodeType.s404, "淇℃伅"); + + if (model.Id.HasValue) + { + 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 != null && logier.Type == EnumUserType.Enterprise) + { + model.IsCollected = await rep.Change<EnterpriseUserCollect>().AsQueryable().AsNoTracking() + .Where(it => it.EnterpriseId == logier.EnterpriseId && it.UserId == model.Id) + .Select(it => it.IsCollected) + .FirstOrDefaultAsync(); + } + } + if (model.CityCode.IsNotNull()) + { + model.CompleteRate += 20; + } + if (model.JobSeekingStatus.HasValue) + { + model.CompleteRate += 20; + } + if (model.UserCredentials.IsNotNull()) + { + model.CompleteRate += 20; + } + if (model.WorkExperience.IsNotNull() || model.WorkSeniority.IsNotNull()) + { + model.CompleteRate += 20; + } + if (model.Weight.HasValue || model.Height.HasValue || model.Photos.IsNotNull()) + { + model.CompleteRate += 20; + } + return model; } @@ -56,32 +227,10 @@ /// <param name="request"></param> /// <param name="cancellationToken"></param> /// <returns></returns> - public async Task<GetUserResumePersonalQueryResult> Handle(GetUserResumePersonalQuery request, CancellationToken cancellationToken) + public Task<GetUserResumePersonalQueryResult> Handle(GetUserResumePersonalQuery request, CancellationToken cancellationToken) { - var model = await rep.GetPersonalQueryable(false) - .GetDetail<User, GetUserResumePersonalQueryResultModel>(cancellationToken); - var result = model.Adapt<GetUserResumePersonalQueryResult>(); - if (model.CityCode.IsNotNull()) - { - result.CompleteRate += 20; - } - if (model.JobSeekingStatus.HasValue) - { - result.CompleteRate += 20; - } - if (model.UserCredentials.IsNotNull()) - { - result.CompleteRate += 20; - } - if (model.WorkExperience.IsNotNull() || model.WorkSeniority.IsNotNull()) - { - result.CompleteRate += 20; - } - if (model.Weight.HasValue || model.Height.HasValue || model.Photos.IsNotNull()) - { - result.CompleteRate += 20; - } - return result; + return rep.GetPersonalQueryable(false) + .GetDetail<User, GetUserResumePersonalQueryResult>(cancellationToken); } /// <summary> -- Gitblit v1.9.1