From 57183ac3ea6571aff6583a214a95eb5af4d4a2f7 Mon Sep 17 00:00:00 2001 From: sunpengfei <i@angelzzz.com> Date: 星期四, 14 八月 2025 17:23:06 +0800 Subject: [PATCH] fix:运营端——C端人员管理——列表展示了企业联系人的信息 --- FlexJobApi.FlexJobServer.Application/Tasks/Queries/TaskInfoQueryHandler.cs | 25 ++++++++++++++++++------- 1 files changed, 18 insertions(+), 7 deletions(-) diff --git a/FlexJobApi.FlexJobServer.Application/Tasks/Queries/TaskInfoQueryHandler.cs b/FlexJobApi.FlexJobServer.Application/Tasks/Queries/TaskInfoQueryHandler.cs index 9b55d17..8002765 100644 --- a/FlexJobApi.FlexJobServer.Application/Tasks/Queries/TaskInfoQueryHandler.cs +++ b/FlexJobApi.FlexJobServer.Application/Tasks/Queries/TaskInfoQueryHandler.cs @@ -56,7 +56,7 @@ .Select(it => new { it.Id, - it.EnterpriseEmployee.HireStatus, + it.HireStatus, it.EnterpriseEmployee.UserSignContractStatus }) .FirstOrDefaultAsync(); @@ -136,6 +136,10 @@ { q = q.Where(it => it.GenderLimit == request.GenderLimit); } + if (logier != null && logier.Type == EnumUserType.Personal && request.IsCollected == true) + { + q = q.Where(it => it.TaskUserCollects.Any(c => c.UserId == logier.Id)); + } var count = new GetTaskInfosQueryResultObjectData { @@ -147,7 +151,14 @@ if (request.Status.HasValue) { - q = q.Where(it => it.Status == request.Status); + if (request.Status == EnumTaskStatus.Wait) + { + q = q.Where(it => it.ReleaseStatus == EnumTaskReleaseStatus.InProcess && it.Status == EnumTaskStatus.Wait); + } + else + { + q = q.Where(it => it.Status == request.Status); + } } if (request.ReleaseStatus.HasValue) { @@ -197,7 +208,7 @@ CheckReceiveStatus = t.CheckReceiveStatus, CreatedTime = t.CreatedTime, RecommendStatus = t.RecommendStatus, - SettlementStatus = t.SettlementStatus + SettlementStatus = t.SettlementStatus, }; var result = await request.PageModel.GetPagedListAsync<GetTaskInfosQueryResult, GetTaskInfosQueryResultItem>(s, cancellationToken); result.ObjectData = count; @@ -222,7 +233,7 @@ q = q.Where(it => it.TaskInfoUsers.Any(tu => tu.EnterpriseEmployee.UserId == logier.Id - && tu.EnterpriseEmployee.HireStatus == EnumTaskUserHireStatus.Wait)); + && tu.HireStatus == EnumTaskUserHireStatus.Wait)); break; case GetPersonalApplyTaskInfosQueryStatus.WaitSignContract: q = q.Where(it => @@ -239,7 +250,7 @@ q = q.Where(it => it.TaskInfoUsers.Any(tu => tu.EnterpriseEmployee.UserId == logier.Id - && (tu.EnterpriseEmployee.HireStatus == EnumTaskUserHireStatus.Wait + && (tu.HireStatus == EnumTaskUserHireStatus.Wait || tu.EnterpriseEmployee.UserSignContractStatus == EnumTaskUserSignContractStatus.Wait))); } var s = q.Select(it => new GetPersonalApplyTaskInfosQueryResultItem @@ -259,7 +270,7 @@ AddressName = it.AddressName, Status = it.TaskInfoUsers.Any(it => it.EnterpriseEmployee.UserId == logier.Id - && it.EnterpriseEmployee.HireStatus == EnumTaskUserHireStatus.Wait) + && it.HireStatus == EnumTaskUserHireStatus.Wait) ? GetPersonalApplyTaskInfosQueryStatus.WaitHire : GetPersonalApplyTaskInfosQueryStatus.WaitSignContract }); @@ -329,7 +340,7 @@ var q = TaskInfoRepository.GetQueryable(rep, true, logier).Where(it => it.TaskInfoUsers.Any(tu => tu.EnterpriseEmployee.UserId == logier.Id - && (tu.EnterpriseEmployee.HireStatus == EnumTaskUserHireStatus.Refuse + && (tu.HireStatus == EnumTaskUserHireStatus.Refuse || tu.EnterpriseEmployee.UserSignContractStatus == EnumTaskUserSignContractStatus.Refuse || tu.EnterpriseEmployee.EnterpriseSignContractStatus == EnumTaskUserSignContractStatus.Refuse))); var s = q.Select(it => new GetPersonalCancelTaskInfosQueryResultItem -- Gitblit v1.9.1