From a57346a5d1f132ab39e3172cf7614163da79bc2b Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期五, 15 八月 2025 14:54:53 +0800
Subject: [PATCH] feat:开发
---
FlexJobApi.Core/Models/FlexJobServer/Tasks/Queries/GetTaskInfosQuery.cs | 5 +++++
FlexJobApi.FlexJobServer.Application/Tasks/Queries/TaskInfoQueryHandler.cs | 10 +++++++++-
FlexJobApi.UserServer.Application/UserResumes/Queries/UserResumeQueryHandler.cs | 6 +++---
FlexJobApi.Core/Models/UserServer/UserResumes/Queries/GetUserResumeQuery.cs | 2 +-
4 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/FlexJobApi.Core/Models/FlexJobServer/Tasks/Queries/GetTaskInfosQuery.cs b/FlexJobApi.Core/Models/FlexJobServer/Tasks/Queries/GetTaskInfosQuery.cs
index 7b21f46..46d3d25 100644
--- a/FlexJobApi.Core/Models/FlexJobServer/Tasks/Queries/GetTaskInfosQuery.cs
+++ b/FlexJobApi.Core/Models/FlexJobServer/Tasks/Queries/GetTaskInfosQuery.cs
@@ -247,6 +247,11 @@
public EnumTaskRecommendStatus RecommendStatus { get; set; }
/// <summary>
+ /// 褰曠敤鐘舵��
+ /// </summary>
+ public EnumTaskUserHireStatus? HireStatus { get; set; }
+
+ /// <summary>
/// 鍙戝竷鏃堕棿
/// </summary>
public DateTimeOffset CreatedTime { get; set; }
diff --git a/FlexJobApi.Core/Models/UserServer/UserResumes/Queries/GetUserResumeQuery.cs b/FlexJobApi.Core/Models/UserServer/UserResumes/Queries/GetUserResumeQuery.cs
index 6b2d603..b8ccd6e 100644
--- a/FlexJobApi.Core/Models/UserServer/UserResumes/Queries/GetUserResumeQuery.cs
+++ b/FlexJobApi.Core/Models/UserServer/UserResumes/Queries/GetUserResumeQuery.cs
@@ -14,7 +14,7 @@
/// <summary>
/// 鏌ヨ鐢ㄦ埛绠�鍘�
/// </summary>
- [Resource([EnumResourceController.UserResume])]
+ [Resource([EnumResourceController.UserResume], AllowAnonymous = true)]
public class GetUserResumeQuery : IRequest<GetUserResumeQueryResult>
{
/// <summary>
diff --git a/FlexJobApi.FlexJobServer.Application/Tasks/Queries/TaskInfoQueryHandler.cs b/FlexJobApi.FlexJobServer.Application/Tasks/Queries/TaskInfoQueryHandler.cs
index 0fc3720..a4feadd 100644
--- a/FlexJobApi.FlexJobServer.Application/Tasks/Queries/TaskInfoQueryHandler.cs
+++ b/FlexJobApi.FlexJobServer.Application/Tasks/Queries/TaskInfoQueryHandler.cs
@@ -211,6 +211,12 @@
CreatedTime = t.CreatedTime,
RecommendStatus = t.RecommendStatus,
SettlementStatus = t.SettlementStatus,
+ HireStatus = logier != null && logier.Type == EnumUserType.Personal
+ ? t.TaskInfoUsers
+ .Where(tu => tu.EnterpriseEmployee.UserId == logier.Id)
+ .Select(tu => tu.HireStatus as EnumTaskUserHireStatus?)
+ .FirstOrDefault()
+ : null
};
var result = await request.PageModel.GetPagedListAsync<GetTaskInfosQueryResult, GetTaskInfosQueryResultItem>(s, cancellationToken);
result.ObjectData = count;
@@ -325,7 +331,9 @@
BenefitContent = it.Benefit.Content
}).ToList(),
AddressName = it.AddressName,
- Status = now <= it.EndTime
+ Status = now < it.BeginTime
+ ? GetPersonalHireTaskInfosQueryStatus.Wait
+ : it.BeginTime <= now && now <= it.EndTime
? GetPersonalHireTaskInfosQueryStatus.InProcess
: GetPersonalHireTaskInfosQueryStatus.Completed
});
diff --git a/FlexJobApi.UserServer.Application/UserResumes/Queries/UserResumeQueryHandler.cs b/FlexJobApi.UserServer.Application/UserResumes/Queries/UserResumeQueryHandler.cs
index aeae21b..8885da0 100644
--- a/FlexJobApi.UserServer.Application/UserResumes/Queries/UserResumeQueryHandler.cs
+++ b/FlexJobApi.UserServer.Application/UserResumes/Queries/UserResumeQueryHandler.cs
@@ -133,12 +133,12 @@
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)
@@ -183,7 +183,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