From 6f450ffa6628d206d4f60284e16e84e4adbcd789 Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期二, 19 八月 2025 13:12:02 +0800
Subject: [PATCH] feat:开发
---
FlexJobApi.FlexJobServer.Application/Tasks/Queries/TaskInfoQueryHandler.cs | 44 +++++++++++++++++++++++++++++++++-----------
1 files changed, 33 insertions(+), 11 deletions(-)
diff --git a/FlexJobApi.FlexJobServer.Application/Tasks/Queries/TaskInfoQueryHandler.cs b/FlexJobApi.FlexJobServer.Application/Tasks/Queries/TaskInfoQueryHandler.cs
index 48d49a8..78c77de 100644
--- a/FlexJobApi.FlexJobServer.Application/Tasks/Queries/TaskInfoQueryHandler.cs
+++ b/FlexJobApi.FlexJobServer.Application/Tasks/Queries/TaskInfoQueryHandler.cs
@@ -56,7 +56,7 @@
.Select(it => new
{
it.Id,
- it.EnterpriseEmployee.HireStatus,
+ it.HireStatus,
it.EnterpriseEmployee.UserSignContractStatus
})
.FirstOrDefaultAsync();
@@ -68,10 +68,12 @@
: taskUser.UserSignContractStatus == EnumTaskUserSignContractStatus.Wait
? GetTaskInfoQueryResultApplyButton.WaitSignContract
: null;
- model.HireButton = now <= model.EndTime
+ model.HireButton = now < model.BeginTime
+ ? GetTaskInfoQueryResultHireButton.Wait
+ : model.BeginTime <= now && now <= model.EndTime
? GetTaskInfoQueryResultHireButton.InProcess
: GetTaskInfoQueryResultHireButton.Completed;
- if (model.HireButton == GetTaskInfoQueryResultHireButton.InProcess && model.BeginTime <= now)
+ if (model.HireButton == GetTaskInfoQueryResultHireButton.InProcess)
{
var submit = await rep.Change<TaskInfoUserSubmit>().AsQueryable().AsNoTracking()
.AnyAsync(it => it.TaskInfoUserId == taskUser.Id && it.CheckReceiveStatus >= EnumTaskUserSubmitCheckReceiveStatus.WaitCheckReceive);
@@ -136,7 +138,7 @@
{
q = q.Where(it => it.GenderLimit == request.GenderLimit);
}
- if (logier.Type == EnumUserType.Personal && request.IsCollected == true)
+ if (logier != null && logier.Type == EnumUserType.Personal && request.IsCollected == true)
{
q = q.Where(it => it.TaskUserCollects.Any(c => c.UserId == logier.Id));
}
@@ -151,7 +153,14 @@
if (request.Status.HasValue)
{
- q = q.Where(it => it.Status == request.Status);
+ if (request.Status == EnumTaskStatus.Wait)
+ {
+ q = q.Where(it => it.ReleaseStatus == EnumTaskReleaseStatus.InProcess && it.Status == EnumTaskStatus.Wait);
+ }
+ else
+ {
+ q = q.Where(it => it.Status == request.Status);
+ }
}
if (request.ReleaseStatus.HasValue)
{
@@ -201,7 +210,15 @@
CheckReceiveStatus = t.CheckReceiveStatus,
CreatedTime = t.CreatedTime,
RecommendStatus = t.RecommendStatus,
+ RecommendTime = t.RecommendTime,
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;
@@ -226,7 +243,7 @@
q = q.Where(it =>
it.TaskInfoUsers.Any(tu =>
tu.EnterpriseEmployee.UserId == logier.Id
- && tu.EnterpriseEmployee.HireStatus == EnumTaskUserHireStatus.Wait));
+ && tu.HireStatus == EnumTaskUserHireStatus.Wait));
break;
case GetPersonalApplyTaskInfosQueryStatus.WaitSignContract:
q = q.Where(it =>
@@ -243,7 +260,7 @@
q = q.Where(it =>
it.TaskInfoUsers.Any(tu =>
tu.EnterpriseEmployee.UserId == logier.Id
- && (tu.EnterpriseEmployee.HireStatus == EnumTaskUserHireStatus.Wait
+ && (tu.HireStatus == EnumTaskUserHireStatus.Wait
|| tu.EnterpriseEmployee.UserSignContractStatus == EnumTaskUserSignContractStatus.Wait)));
}
var s = q.Select(it => new GetPersonalApplyTaskInfosQueryResultItem
@@ -263,7 +280,7 @@
AddressName = it.AddressName,
Status = it.TaskInfoUsers.Any(it =>
it.EnterpriseEmployee.UserId == logier.Id
- && it.EnterpriseEmployee.HireStatus == EnumTaskUserHireStatus.Wait)
+ && it.HireStatus == EnumTaskUserHireStatus.Wait)
? GetPersonalApplyTaskInfosQueryStatus.WaitHire
: GetPersonalApplyTaskInfosQueryStatus.WaitSignContract
});
@@ -288,8 +305,11 @@
{
switch (request.Status.Value)
{
+ case GetPersonalHireTaskInfosQueryStatus.Wait:
+ q = q.Where(it => now < it.BeginTime);
+ break;
case GetPersonalHireTaskInfosQueryStatus.InProcess:
- q = q.Where(it => now <= it.EndTime);
+ q = q.Where(it => it.BeginTime <= now && now <= it.EndTime);
break;
case GetPersonalHireTaskInfosQueryStatus.Completed:
q = q.Where(it => it.EndTime < now);
@@ -313,7 +333,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
});
@@ -333,7 +355,7 @@
var q = TaskInfoRepository.GetQueryable(rep, true, logier).Where(it =>
it.TaskInfoUsers.Any(tu =>
tu.EnterpriseEmployee.UserId == logier.Id
- && (tu.EnterpriseEmployee.HireStatus == EnumTaskUserHireStatus.Refuse
+ && (tu.HireStatus == EnumTaskUserHireStatus.Refuse
|| tu.EnterpriseEmployee.UserSignContractStatus == EnumTaskUserSignContractStatus.Refuse
|| tu.EnterpriseEmployee.EnterpriseSignContractStatus == EnumTaskUserSignContractStatus.Refuse)));
var s = q.Select(it => new GetPersonalCancelTaskInfosQueryResultItem
--
Gitblit v1.9.1