feat:开发

sunpengfei

2025-09-02 2dfe3b8df9d01bb810224115522ba90da9b31f21

 FlexJobApi.FlexJobServer.Application/Tasks/Queries/TaskInfoQueryHandler.cs

@@ -57,21 +57,25 @@
                    {
                        it.Id,
                        it.HireStatus,
                        it.EnterpriseEmployeeId,
                        it.EnterpriseEmployee.UserSignContractStatus
                    })
                    .FirstOrDefaultAsync();
                if (taskUser != null)
                {
                    model.EnterpriseEmployeeId = taskUser.EnterpriseEmployeeId;
                    model.HireStatus = taskUser.HireStatus;
                    model.ApplyButton = taskUser.HireStatus == EnumTaskUserHireStatus.Wait
                        ? GetTaskInfoQueryResultApplyButton.WaitHire
                        : 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);
@@ -178,6 +182,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,
@@ -208,7 +214,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;
@@ -295,8 +309,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);
@@ -320,7 +337,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
            });