From 4b574fd74eece20f4e64b48c39c5aa6ad70b0d0f Mon Sep 17 00:00:00 2001 From: sunpengfei <i@angelzzz.com> Date: 星期一, 18 八月 2025 16:47:46 +0800 Subject: [PATCH] feat:开发 --- FlexJobApi.UserServer.Application/UserResumes/Queries/UserResumeQueryHandler.cs | 28 ++++++++++++++++++++-------- 1 files changed, 20 insertions(+), 8 deletions(-) diff --git a/FlexJobApi.UserServer.Application/UserResumes/Queries/UserResumeQueryHandler.cs b/FlexJobApi.UserServer.Application/UserResumes/Queries/UserResumeQueryHandler.cs index b80efa1..ae5c073 100644 --- a/FlexJobApi.UserServer.Application/UserResumes/Queries/UserResumeQueryHandler.cs +++ b/FlexJobApi.UserServer.Application/UserResumes/Queries/UserResumeQueryHandler.cs @@ -104,6 +104,9 @@ 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, @@ -112,6 +115,13 @@ 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; @@ -126,17 +136,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, "璇烽�夋嫨鐢ㄦ埛"); @@ -159,16 +169,18 @@ Age = enterpriseEmployee.Age, }; } - if (model == null) throw Oops.Oh(EnumErrorCodeType.s404, "璇ヤ俊鎭�"); + if (model == null) throw Oops.Oh(EnumErrorCodeType.s404, "淇℃伅"); - model.TaskInfoUsers = model.TaskInfoUsers.Where(it => it.SignContractTime.HasValue).ToList(); if (model.Id.HasValue) { model.TaskInfoUsers = repTaskInfoUser.AsQueryable().AsNoTracking() - .Where(it => it.EnterpriseEmployee.UserId == model.Id && it.EnterpriseEmployee.EnterpriseSignContractTime.HasValue) + .Where(it => + it.EnterpriseEmployee.UserId == model.Id + && it.HireStatus == EnumTaskUserHireStatus.Pass + && it.HireTime.HasValue) .Select(it => new GetUserResumeQueryResultExperience { - SignContractTime = it.EnterpriseEmployee.EnterpriseSignContractTime, + HireTime = it.HireTime, EnterpriseName = it.TaskInfo.Enterprise.EnterpriseName, Name = it.TaskInfo.Name }) @@ -176,7 +188,7 @@ 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