From 5454e326a76e695ba4a51d5994c88ef7ded76efc Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期四, 21 八月 2025 13:24:10 +0800
Subject: [PATCH] feat:开发
---
FlexJobApi.FlexJobServer.Application/Tasks/Queries/TaskInfoQueryHandler.cs | 34 +++++++++++++++++++++++++++++-----
1 files changed, 29 insertions(+), 5 deletions(-)
diff --git a/FlexJobApi.FlexJobServer.Application/Tasks/Queries/TaskInfoQueryHandler.cs b/FlexJobApi.FlexJobServer.Application/Tasks/Queries/TaskInfoQueryHandler.cs
index 883169c..6bf42ce 100644
--- a/FlexJobApi.FlexJobServer.Application/Tasks/Queries/TaskInfoQueryHandler.cs
+++ b/FlexJobApi.FlexJobServer.Application/Tasks/Queries/TaskInfoQueryHandler.cs
@@ -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);
@@ -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)
{
@@ -171,6 +180,8 @@
Id = t.Id,
Name = t.Name,
Code = t.Code,
+ EnterpriseName = t.Enterprise.EnterpriseName,
+ UserName = t.Enterprise.Users.Where(u => u.Id == t.CreatedUserId).Select(u => u.UserName).FirstOrDefault(),
BillingMethod = t.BillingMethod,
ServiceFee = t.ServiceFee,
SettlementCycle = t.SettlementCycle,
@@ -201,7 +212,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;
@@ -288,8 +307,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 +335,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
});
--
Gitblit v1.9.1