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 |   32 ++++++++++++++++++++++----------
 1 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/FlexJobApi.FlexJobServer.Application/Tasks/Queries/TaskInfoQueryHandler.cs b/FlexJobApi.FlexJobServer.Application/Tasks/Queries/TaskInfoQueryHandler.cs
index 48d49a8..0fc3720 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)
             {
@@ -226,7 +235,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 +252,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 +272,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 +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);
@@ -333,7 +345,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