From 11e0c46d96a9de0c77cbc7509d34f470823bbc65 Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期三, 03 九月 2025 13:48:35 +0800
Subject: [PATCH] feat:开发
---
FlexJobApi.UserServer.Application/UserResumes/Queries/UserResumeQueryHandler.cs | 48 +++++++++++++++++++++++++++++++++++++-----------
1 files changed, 37 insertions(+), 11 deletions(-)
diff --git a/FlexJobApi.UserServer.Application/UserResumes/Queries/UserResumeQueryHandler.cs b/FlexJobApi.UserServer.Application/UserResumes/Queries/UserResumeQueryHandler.cs
index 5a9469e..3c04b55 100644
--- a/FlexJobApi.UserServer.Application/UserResumes/Queries/UserResumeQueryHandler.cs
+++ b/FlexJobApi.UserServer.Application/UserResumes/Queries/UserResumeQueryHandler.cs
@@ -19,6 +19,7 @@
IRepository<User> rep,
IRepository<TaskInfoUser> repTaskInfoUser
) :
+ IRequestHandler<GetOpenUserResumesQuery, GetUserResumesQueryResult>,
IRequestHandler<GetUserResumesQuery, GetUserResumesQueryResult>,
IRequestHandler<GetUserResumeQuery, GetUserResumeQueryResult>,
IRequestHandler<GetUserResumePersonalQuery, GetUserResumePersonalQueryResult>,
@@ -32,6 +33,17 @@
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>
@@ -39,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)));
@@ -75,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));
}
@@ -91,6 +105,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,
@@ -99,6 +116,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;
@@ -113,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, "璇烽�夋嫨鐢ㄦ埛");
@@ -146,16 +170,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
})
@@ -163,7 +189,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