From 4cb79220f9687b2c98decc2050e464d00553add0 Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期五, 15 八月 2025 16:27:05 +0800
Subject: [PATCH] feat:开发
---
FlexJobApi.UserServer.Application/UserResumes/Queries/UserResumeQueryHandler.cs | 33 +++++++++++++++++++++++----------
1 files changed, 23 insertions(+), 10 deletions(-)
diff --git a/FlexJobApi.UserServer.Application/UserResumes/Queries/UserResumeQueryHandler.cs b/FlexJobApi.UserServer.Application/UserResumes/Queries/UserResumeQueryHandler.cs
index aa0f928..ae5c073 100644
--- a/FlexJobApi.UserServer.Application/UserResumes/Queries/UserResumeQueryHandler.cs
+++ b/FlexJobApi.UserServer.Application/UserResumes/Queries/UserResumeQueryHandler.cs
@@ -33,7 +33,7 @@
private readonly IRepository<TaskInfoUser> repTaskInfoUser = repTaskInfoUser;
/// <summary>
- /// 鏌ヨ绠�鍘嗗垎椤靛垪琛ㄦ暟鎹�
+ /// 鏌ヨ寮�鏀剧畝鍘嗗垎椤靛垪琛ㄦ暟鎹�
/// </summary>
/// <param name="request"></param>
/// <param name="cancellationToken"></param>
@@ -52,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)));
@@ -103,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,
@@ -111,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;
@@ -125,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, "璇烽�夋嫨鐢ㄦ埛");
@@ -158,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
})
@@ -175,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