From c1bff84f284ee912a3db6b866be3916e1d762a90 Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期三, 13 八月 2025 13:07:48 +0800
Subject: [PATCH] feat:开发

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

diff --git a/FlexJobApi.FlexJobServer.Application/Tasks/Queries/TaskInfoQueryHandler.cs b/FlexJobApi.FlexJobServer.Application/Tasks/Queries/TaskInfoQueryHandler.cs
index f2c155d..5354794 100644
--- a/FlexJobApi.FlexJobServer.Application/Tasks/Queries/TaskInfoQueryHandler.cs
+++ b/FlexJobApi.FlexJobServer.Application/Tasks/Queries/TaskInfoQueryHandler.cs
@@ -37,6 +37,7 @@
         /// <returns></returns>
         public async Task<GetTaskInfoQueryResult> Handle(GetTaskInfoQuery request, CancellationToken cancellationToken)
         {
+            var now = DateTime.Now;
             var logier = JwtUtils.GetCurrentLogier();
             var model = await TaskInfoRepository.GetQueryable(rep)
                 .Where(it => it.Id == request.Id)
@@ -48,11 +49,37 @@
                 .CountAsync(it => it.TaskInfoId == model.Id);
             if (logier != null && logier.Type == EnumUserType.Personal)
             {
-                model.HireStatus = await rep.Change<TaskInfoUser>().AsQueryable().AsNoTracking()
+                var taskUser = await rep.Change<TaskInfoUser>().AsQueryable().AsNoTracking()
                     .Include(it => it.EnterpriseEmployee)
                     .Where(it => it.TaskInfoId == model.Id && it.EnterpriseEmployee.UserId == logier.Id)
-                    .Select(it => it.EnterpriseEmployee.HireStatus)
+                    .Select(it => new
+                    {
+                        it.Id,
+                        it.EnterpriseEmployee.HireStatus,
+                        it.EnterpriseEmployee.UserSignContractStatus
+                    })
                     .FirstOrDefaultAsync();
+                if (taskUser != null)
+                {
+                    model.HireStatus = taskUser.HireStatus;
+                    model.ApplyButton = taskUser.HireStatus == EnumTaskUserHireStatus.Wait
+                        ? GetTaskInfoQueryResultApplyButton.WaitHire
+                        : taskUser.UserSignContractStatus == EnumTaskUserSignContractStatus.Wait
+                        ? GetTaskInfoQueryResultApplyButton.WaitSignContract
+                        : null;
+                    model.HireButton = now <= model.EndTime
+                        ? GetTaskInfoQueryResultHireButton.InProcess
+                        : GetTaskInfoQueryResultHireButton.Completed;
+                    if (model.HireButton == GetTaskInfoQueryResultHireButton.InProcess && model.BeginTime <= now)
+                    {
+                        var submit = await rep.Change<TaskInfoUserSubmit>().AsQueryable().AsNoTracking()
+                            .AnyAsync(it => it.TaskInfoUserId == taskUser.Id && it.CheckReceiveStatus >= EnumTaskUserSubmitCheckReceiveStatus.WaitCheckReceive);
+                        if (!submit)
+                        {
+                            model.HireButton = GetTaskInfoQueryResultHireButton.ApplyCheckReceive;
+                        }
+                    }
+                }
                 model.IsCollected = await rep.Change<UserTaskCollect>().AsQueryable().AsNoTracking()
                     .AnyAsync(it => it.TaskInfoId == request.Id && it.UserId == logier.Id);
             }
@@ -217,6 +244,7 @@
                     BenefitCode = it.BenefitCode,
                     BenefitContent = it.Benefit.Content
                 }).ToList(),
+                AddressName = it.AddressName,
                 Status = it.TaskInfoUsers.Any(it =>
                     it.EnterpriseEmployee.UserId == logier.Id
                     && it.EnterpriseEmployee.HireStatus == EnumTaskUserHireStatus.Wait)
@@ -239,7 +267,6 @@
             var q = TaskInfoRepository.GetQueryable(rep, true, logier).Where(it =>
                 it.TaskInfoUsers.Any(tu =>
                     tu.EnterpriseEmployee.UserId == logier.Id
-                    && tu.EnterpriseEmployee.HireStatus == EnumTaskUserHireStatus.Pass
                     && tu.ArrangeStatus == EnumTaskUserArrangeStatus.Complete));
             if (request.Status.HasValue)
             {
@@ -255,14 +282,6 @@
                         break;
                 }
             }
-            else
-            {
-                q = q.Where(it =>
-                    it.TaskInfoUsers.Any(tu =>
-                        tu.EnterpriseEmployee.UserId == logier.Id
-                        && (tu.EnterpriseEmployee.HireStatus == EnumTaskUserHireStatus.Wait
-                        || tu.EnterpriseEmployee.UserSignContractStatus == EnumTaskUserSignContractStatus.Wait)));
-            }
             var s = q.Select(it => new GetPersonalHireTaskInfosQueryResultItem
             {
                 Id = it.Id,
@@ -277,6 +296,7 @@
                     BenefitCode = it.BenefitCode,
                     BenefitContent = it.Benefit.Content
                 }).ToList(),
+                AddressName = it.AddressName,
                 Status = now <= it.EndTime
                     ? GetPersonalHireTaskInfosQueryStatus.InProcess
                     : GetPersonalHireTaskInfosQueryStatus.Completed
@@ -314,6 +334,7 @@
                     BenefitCode = it.BenefitCode,
                     BenefitContent = it.Benefit.Content
                 }).ToList(),
+                AddressName = it.AddressName,
             });
             return await request.PageModel.GetPagedListAsync<GetPersonalCancelTaskInfosQueryResult, GetPersonalCancelTaskInfosQueryResultItem>(s, cancellationToken);
         }

--
Gitblit v1.9.1