feat:开发

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);
        }

@@ -118,6 +134,29 @@
            {
                q = q.Where(it => it.TaskInfo.EnterpriseId == logier.EnterpriseId);
            }
            if (logier.Type == EnumUserType.Enterprise && logier.ClientType == EnumClientType.Wxmp)
            {
                if (request.CheckReceiveStatus == null)
                {
                    throw Oops.Oh(EnumErrorCodeType.s400, "请选择验收状态");
                }
                if (request.Date == null)
                {
                    throw Oops.Oh(EnumErrorCodeType.s400, "请选择日期");
                }
                q = q.Where(it =>
                    it.TaskInfo.EnterpriseId == logier.EnterpriseId
                    && (request.CheckReceiveStatus == EnumTaskCheckReceiveStatus.WaitSubmit
                        ? !it.Submits.Any(s => s.Date.Date == request.Date.Value.Date)
                        : it.Submits.Any(s =>
                            s.Date.Date == request.Date.Value.Date
                            && (request.CheckReceiveStatus == EnumTaskCheckReceiveStatus.WaitSubmit
                            ? s.CheckReceiveStatus == EnumTaskUserSubmitCheckReceiveStatus.WaitSubmit
                            : (request.CheckReceiveStatus == EnumTaskCheckReceiveStatus.WaitCheckReceive
                            ? s.CheckReceiveStatus == EnumTaskUserSubmitCheckReceiveStatus.WaitCheckReceive
                            : (s.CheckReceiveStatus == EnumTaskUserSubmitCheckReceiveStatus.Success
                            || s.CheckReceiveStatus == EnumTaskUserSubmitCheckReceiveStatus.Fail))))));
            }
            var s = q.Select(it => new GetCheckReceiveTaskQueryResultItem
            {
                Id = it.Id,
@@ -131,13 +170,22 @@
                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);
            result.ObjectData = await repTaskInfo.AsQueryable().AsNoTracking()
                .Where(it => it.Id == request.TaskInfoId)
                .GetDetail<TaskInfo, GetCheckReceiveTaskQueryResultObjectData>();
                    .Where(it => it.Id == request.TaskInfoId)
                    .GetDetail<TaskInfo, GetCheckReceiveTaskQueryResultObjectData>();
            return result;
        }

@@ -176,7 +224,7 @@
        /// <param name="request"></param>
        /// <param name="cancellationToken"></param>
        /// <returns></returns>
        public Task<GetCheckReceiveTaskUserSubmitQueryResult> Handle(GetCheckReceiveTaskUserSubmitQuery request, CancellationToken cancellationToken)
        public async Task<GetCheckReceiveTaskUserSubmitQueryResult> Handle(GetCheckReceiveTaskUserSubmitQuery request, CancellationToken cancellationToken)
        {
            var q = repTaskInfoUserSubmit.AsQueryable().AsNoTracking();
            if (request.SubmitId.HasValue)
@@ -191,7 +239,12 @@
            {
                q = q.Where(it => it.Date.Date == request.Date.Value.Date && it.TaskInfoUserId == request.TaskInfoUserId.Value);
            }
            return q.GetDetail<TaskInfoUserSubmit, GetCheckReceiveTaskUserSubmitQueryResult>();
            var model = await q.GetDetail<TaskInfoUserSubmit, GetCheckReceiveTaskUserSubmitQueryResult>();
            model.Files = await repTaskInfoUserSubmit.Change<TaskInfoUserSubmitFile>().AsQueryable().AsNoTracking()
                .Where(it => it.SubmitId == model.Id)
                .Select(it => it.File)
                .ToListAsync();
            return model;
        }
    }
}