From 313c3132dcd1768df34e3717544df9e0e9d36514 Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期五, 15 八月 2025 14:44:53 +0800
Subject: [PATCH] feat:开发

---
 FlexJobApi.FlexJobServer.Application/Tasks/Queries/TaskInfoQueryHandler.cs |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/FlexJobApi.FlexJobServer.Application/Tasks/Queries/TaskInfoQueryHandler.cs b/FlexJobApi.FlexJobServer.Application/Tasks/Queries/TaskInfoQueryHandler.cs
index 8002765..0fc3720 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);
@@ -295,8 +297,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);

--
Gitblit v1.9.1