sunpengfei
2025-09-01 185eca1406926d46fa9f50d07a0c0ecc65ab6b96
FlexJobApi.UserServer.Application/EnterpriseEmployees/Queries/EnterpriseEmployeeQueryHandler.cs
@@ -67,7 +67,28 @@
            }
            if (request.UserSignContractStatus.HasValue)
            {
                q = q.Where(it => it.UserSignContractStatus == request.UserSignContractStatus);
                if (logier.ClientType == EnumClientType.Wxmp)
                {
                    switch (request.UserSignContractStatus.Value)
                    {
                        case EnumTaskUserSignContractStatus.Wait:
                            q = q.Where(it => it.UserSignContractStatus == null || it.UserSignContractStatus == request.UserSignContractStatus);
                            break;
                        case EnumTaskUserSignContractStatus.Pass:
                            q = q.Where(it => it.UserSignContractStatus == request.UserSignContractStatus && it.EnterpriseSignContractStatus == EnumTaskUserSignContractStatus.Pass);
                            break;
                        case EnumTaskUserSignContractStatus.Stop:
                            q = q.Where(it => it.UserSignContractStatus == request.UserSignContractStatus);
                            break;
                        default:
                            q = q.Where(it => it.UserSignContractStatus == request.UserSignContractStatus);
                            break;
                    }
                }
                else
                {
                    q = q.Where(it => it.UserSignContractStatus == request.UserSignContractStatus);
                }
            }
            if (request.EnterpriseSignContractStatus.HasValue)
            {
@@ -99,13 +120,14 @@
                UserSignContractStatus = it.UserSignContractStatus,
                HireTime = it.TaskInfoUsers
                    .OrderBy(tu => tu.HireTime)
                    .Where(tu => tu.HireStatus == EnumTaskUserHireStatus.Pass && tu.HireTime.HasValue)
                    .Where(tu => tu.HireTime.HasValue)
                    .Select(tu => tu.HireTime)
                    .FirstOrDefault(),
                UserRealTime = it.User.RealTime,
                UserSignContractTime = it.UserSignContractTime,
                EnterpriseSignContractStatus = it.EnterpriseSignContractStatus,
                EnterpriseSignContractTime = it.EnterpriseSignContractTime
                EnterpriseSignContractTime = it.EnterpriseSignContractTime,
                ContractUrl = it.ContractUrl,
            });
            return await request.PageModel.GetPagedListAsync<GetEnterpriseEmployeesQueryResult, GetEnterpriseEmployeesQueryResultItem>(s, cancellationToken);
        }
@@ -154,13 +176,20 @@
                .Where(it => it.UserId == logier.Id);
            if (request.UserSignContractStatus.HasValue)
            {
                q = q.Where(it => it.UserSignContractStatus == request.UserSignContractStatus.Value);
                if (request.UserSignContractStatus == EnumTaskUserSignContractStatus.Pass)
                {
                    q = q.Where(it => it.UserSignContractStatus == EnumTaskUserSignContractStatus.Pass && it.EnterpriseSignContractStatus == EnumTaskUserSignContractStatus.Pass);
                }
                else
                {
                    q = q.Where(it => it.UserSignContractStatus == request.UserSignContractStatus.Value);
                }
            }
            else
            {
                q = q.Where(it =>
                    it.UserSignContractStatus == EnumTaskUserSignContractStatus.Wait
                    || it.UserSignContractStatus == EnumTaskUserSignContractStatus.Effect
                    || it.UserSignContractStatus == EnumTaskUserSignContractStatus.Pass && it.EnterpriseSignContractStatus == EnumTaskUserSignContractStatus.Pass
                    || it.UserSignContractStatus == EnumTaskUserSignContractStatus.Stop);
            }
            var s = q.Select(it => new GetPersonalUserElectronSignsQueryResultItem