sunpengfei
2025-08-13 fed0f0b4f2abeca2ee641ee3f95416f68a06fe09
FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskCheckReceiveQueryHandler.cs
@@ -93,7 +93,23 @@
                    q = q.Where(it => it.CheckReceiveStatus == request.CheckReceiveStatus);
                }
            }
            var s = q.ProjectToType<GetCheckReceiveTasksQueryResultItem>();
            var s = q.Select(it => new GetCheckReceiveTasksQueryResultItem
            {
                Id = it.Id,
                Name = it.Name,
                Code = it.Code,
                BillingMethod = it.BillingMethod,
                ServiceFee = it.ServiceFee,
                SettlementCycle = it.SettlementCycle,
                CreatedTime = it.CreatedTime,
                BeginTime = it.BeginTime,
                EndTime = it.EndTime,
                AddressName = it.AddressName,
                LastCheckReceiveTime = it.LastCheckReceiveTime,
                CheckReceiveStatus = logier.Type == EnumUserType.Enterprise && logier.ClientType == EnumClientType.Wxmp && request.Date.HasValue
                    ? request.CheckReceiveStatus
                    : it.CheckReceiveStatus,
            });
            return await request.PageModel.GetPagedListAsync<GetCheckReceiveTasksQueryResult, GetCheckReceiveTasksQueryResultItem>(s, cancellationToken);
        }
@@ -154,7 +170,16 @@
                ContactPhoneNumber = it.EnterpriseEmployee.User.ContactPhoneNumber,
                IsReal = it.EnterpriseEmployee.User.IsReal,
                RealMethod = it.EnterpriseEmployee.User.RealMethod,
                CheckReceiveStatus = it.CheckReceiveStatus,
                CheckReceiveStatus = logier.Type == EnumUserType.Enterprise && logier.ClientType == EnumClientType.Wxmp && request.Date.HasValue
                    ? it.Submits
                        .Where(s => s.Date == request.Date)
                        .Select(s => (s.CheckReceiveStatus == EnumTaskUserSubmitCheckReceiveStatus.WaitSubmit
                        ? EnumTaskCheckReceiveStatus.WaitSubmit
                        : s.CheckReceiveStatus == EnumTaskUserSubmitCheckReceiveStatus.WaitCheckReceive
                        ? EnumTaskCheckReceiveStatus.WaitCheckReceive
                        : EnumTaskCheckReceiveStatus.Completed) as EnumTaskCheckReceiveStatus?)
                        .FirstOrDefault() ?? EnumTaskCheckReceiveStatus.WaitSubmit
                    : it.CheckReceiveStatus,
                LastSubmitTime = it.LastSubmitTime,
            });
            var result = await request.PageModel.GetPagedListAsync<GetCheckReceiveTaskQueryResult, GetCheckReceiveTaskQueryResultItem>(s, cancellationToken);