From 5c45bc53e2c18e45130c21048df4af4896455c6d Mon Sep 17 00:00:00 2001 From: sunpengfei <i@angelzzz.com> Date: 星期五, 12 九月 2025 15:58:48 +0800 Subject: [PATCH] feat:开发 --- FlexJobApi.UserServer.Application/EnterpriseEmployees/Queries/EnterpriseEmployeeQueryHandler.cs | 68 ++++++++++++++++++++++----------- 1 files changed, 45 insertions(+), 23 deletions(-) diff --git a/FlexJobApi.UserServer.Application/EnterpriseEmployees/Queries/EnterpriseEmployeeQueryHandler.cs b/FlexJobApi.UserServer.Application/EnterpriseEmployees/Queries/EnterpriseEmployeeQueryHandler.cs index beff6f6..0c59ee7 100644 --- a/FlexJobApi.UserServer.Application/EnterpriseEmployees/Queries/EnterpriseEmployeeQueryHandler.cs +++ b/FlexJobApi.UserServer.Application/EnterpriseEmployees/Queries/EnterpriseEmployeeQueryHandler.cs @@ -80,34 +80,56 @@ { q = q.Where(it => (it.UserId.HasValue && it.User.IsReal) == request.IsReal.Value); } - if (request.UserSignContractStatus.HasValue) + if (request.SignContractStatus.HasValue) { - if (logier.ClientType == EnumClientType.Wxmp) + switch (request.SignContractStatus.Value) { - 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); + case EnumGetEnterpriseEmployeesQuerySignContractStatus.UserWait: + q = q.Where(it => it.UserSignContractStatus == null || it.UserSignContractStatus == EnumTaskUserSignContractStatus.Wait); + break; + case EnumGetEnterpriseEmployeesQuerySignContractStatus.EnterpriseWait: + q = q.Where(it => it.EnterpriseSignContractStatus == EnumTaskUserSignContractStatus.Wait); + break; + case EnumGetEnterpriseEmployeesQuerySignContractStatus.Pass: + q = q.Where(it => + it.UserSignContractStatus == EnumTaskUserSignContractStatus.Pass + && it.EnterpriseSignContractStatus == EnumTaskUserSignContractStatus.Pass); + break; + default: + break; } } - if (request.EnterpriseSignContractStatus.HasValue) + else { - q = q.Where(it => it.EnterpriseSignContractStatus == request.EnterpriseSignContractStatus); + if (request.UserSignContractStatus.HasValue) + { + 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) + { + q = q.Where(it => it.EnterpriseSignContractStatus == request.EnterpriseSignContractStatus); + } } var s = q.Select(it => new GetEnterpriseEmployeesQueryResultItem { -- Gitblit v1.9.1