From a59e5d99a77fcb152e6fe49df78f69cb5fd6c5a0 Mon Sep 17 00:00:00 2001 From: sunpengfei <i@angelzzz.com> Date: 星期二, 19 八月 2025 15:58:10 +0800 Subject: [PATCH] feat:开发 --- FlexJobApi.FlexJobServer.Application/TaskUsers/Queries/TaskUserQueryHandler.cs | 69 +++++++++++++++++----------------- 1 files changed, 34 insertions(+), 35 deletions(-) diff --git a/FlexJobApi.FlexJobServer.Application/TaskUsers/Queries/TaskUserQueryHandler.cs b/FlexJobApi.FlexJobServer.Application/TaskUsers/Queries/TaskUserQueryHandler.cs index ad8c7e6..3390865 100644 --- a/FlexJobApi.FlexJobServer.Application/TaskUsers/Queries/TaskUserQueryHandler.cs +++ b/FlexJobApi.FlexJobServer.Application/TaskUsers/Queries/TaskUserQueryHandler.cs @@ -1,5 +1,6 @@ 锘縰sing FlexJobApi.Core; using Furion.DatabaseAccessor; +using Furion.FriendlyException; using MediatR; using Microsoft.EntityFrameworkCore; using System; @@ -17,7 +18,7 @@ IRepository<TaskInfoUser> rep) : IRequestHandler<GetTaskUsersQuery, GetTaskUsersQueryResult>, IRequestHandler<GetArrangeTaskUsersQuery, GetArrangeTaskUsersQueryResult>, - IRequestHandler<GetCheckReceiveTaskUserInfosQuery, GetCheckReceiveTaskUserInfosQueryResult> + IRequestHandler<GetTaskUserHireStatusQuery, GetTaskUserHireStatusQueryResult> { private readonly IRepository<TaskInfoUser> rep = rep; @@ -33,10 +34,22 @@ var q = rep.AsQueryable().AsNoTracking() .OrderBy(it => it.CreatedTime) .Where(it => it.TaskInfo.EnterpriseId == logier.EnterpriseId && it.TaskInfoId == request.Id); + if (request.Keywords.IsNotNull()) + { + q = q.Where(it => + it.EnterpriseEmployee.User.Name.Contains(request.Keywords) + || it.EnterpriseEmployee.User.Identity.Contains(request.Keywords) + || it.EnterpriseEmployee.User.PhoneNumber.Contains(request.Keywords)); + } + if (request.HireStatus.HasValue) + { + q = q.Where(it => it.HireStatus == request.HireStatus); + } var s = q .Select(it => new GetTaskUsersQueryResultItem { Id = it.Id, + EnterpriseEmployeeId = it.EnterpriseEmployeeId, Avatar = it.EnterpriseEmployee.User.Avatar, Name = it.EnterpriseEmployee.User.Name, Identity = it.EnterpriseEmployee.User.Identity, @@ -49,10 +62,10 @@ PersonalIdentityContent = it.EnterpriseEmployee.User.PersonalIdentity.Content, EducationalBackgroundCode = it.EnterpriseEmployee.User.EducationalBackgroundCode, EducationalBackgroundContent = it.EnterpriseEmployee.User.EducationalBackground.Content, - TaskCount = it.EnterpriseEmployee.TaskInfoUsers.Count(tu => tu.EnterpriseEmployee.HireStatus == EnumTaskUserHireStatus.Pass), + TaskCount = it.EnterpriseEmployee.TaskInfoUsers.Count(tu => tu.HireStatus == EnumTaskUserHireStatus.Pass), WorkSeniority = it.EnterpriseEmployee.User.WorkSeniority, WorkExperience = it.EnterpriseEmployee.User.WorkExperience, - HireStatus = it.EnterpriseEmployee.HireStatus + HireStatus = it.HireStatus }); return await request.PageModel.GetPagedListAsync<GetTaskUsersQueryResult, GetTaskUsersQueryResultItem>(s, cancellationToken); } @@ -71,7 +84,7 @@ .Where(it => it.TaskInfo.EnterpriseId == logier.EnterpriseId && it.TaskInfoId == request.Id - && it.EnterpriseEmployee.HireStatus == EnumTaskUserHireStatus.Pass + && it.HireStatus == EnumTaskUserHireStatus.Pass && it.EnterpriseEmployee.UserSignContractStatus == EnumTaskUserSignContractStatus.Pass && it.EnterpriseEmployee.EnterpriseSignContractStatus == EnumTaskUserSignContractStatus.Pass); if (request.ArrangeStatus.HasValue) @@ -101,7 +114,7 @@ PersonalIdentityContent = it.EnterpriseEmployee.User.PersonalIdentity.Content, EducationalBackgroundCode = it.EnterpriseEmployee.User.EducationalBackgroundCode, EducationalBackgroundContent = it.EnterpriseEmployee.User.EducationalBackground.Content, - TaskCount = it.EnterpriseEmployee.TaskInfoUsers.Count(tu => tu.EnterpriseEmployee.HireStatus == EnumTaskUserHireStatus.Pass), + TaskCount = it.EnterpriseEmployee.TaskInfoUsers.Count(tu => tu.HireStatus == EnumTaskUserHireStatus.Pass), WorkSeniority = it.EnterpriseEmployee.User.WorkSeniority, WorkExperience = it.EnterpriseEmployee.User.WorkExperience, ArrangeStatus = it.ArrangeStatus @@ -110,50 +123,36 @@ } /// <summary> - /// 鏌ヨ楠屾敹鍒嗛〉鍒楄〃 + /// 鏌ヨ搴旇仒鎶ュ悕浜哄憳褰曠敤鐘舵�� /// </summary> /// <param name="request"></param> /// <param name="cancellationToken"></param> /// <returns></returns> - public async Task<GetCheckReceiveTaskUserInfosQueryResult> Handle(GetCheckReceiveTaskUserInfosQuery request, CancellationToken cancellationToken) + public async Task<GetTaskUserHireStatusQueryResult> Handle(GetTaskUserHireStatusQuery request, CancellationToken cancellationToken) { var logier = JwtUtils.GetCurrentLogier(); var q = rep.AsQueryable().AsNoTracking() - .OrderBy(it => it.CreatedTime) - .AsQueryable(); - + .Where(it => it.TaskInfoId == request.TaskInfoId); if (logier.Type == EnumUserType.Personal) { - q = q.Where(it => it.EnterpriseEmployee.UserId == logier.Id); + q = q.Where(it => it.EnterpriseEmployee.UserId == request.UserId); } - else if (logier.Type == EnumUserType.Enterprise) + else if (request.UserId == null) { - q = q.Where(it => it.TaskInfo.EnterpriseId == logier.EnterpriseId); + throw Oops.Oh(EnumErrorCodeType.s400, "璇烽�夋嫨鐢ㄦ埛"); } - if (request.TaskInfoId.HasValue) + else { - q = q.Where(it => it.TaskInfoId == request.TaskInfoId); + q = q.Where(it => it.EnterpriseEmployee.UserId == request.UserId); } - if (request.Keywords.IsNotNull()) - { - q = q.Where(it => - it.EnterpriseEmployee.User.Name.Contains(request.Keywords) - || it.EnterpriseEmployee.User.ContactPhoneNumber.Contains(request.Keywords) - || it.EnterpriseEmployee.User.Identity.Contains(request.Keywords)); - } - if (request.SubmitTimeBegin.HasValue && request.SubmitTimeEnd.HasValue) - { - q = q.Where(it => it.Submits.Any(s => request.SubmitTimeBegin <= s.CreatedTime && s.CreatedTime <= request.SubmitTimeEnd)); - } - if (request.CheckReceiveStatus.HasValue) - { - q = q.Where(it => it.CheckReceiveStatus == request.CheckReceiveStatus); - } - var s = q.Select(it => new GetCheckReceiveTaskUserInfosQueryResultItem - { - - }); - return await request.PageModel.GetPagedListAsync<GetCheckReceiveTaskUserInfosQueryResult, GetCheckReceiveTaskUserInfosQueryResultItem>(s, cancellationToken); + var model = await q + .Select(it => new GetTaskUserHireStatusQueryResult + { + HireStatus = it.HireStatus + }) + .FirstOrDefaultAsync(cancellationToken); + if (model == null) throw Oops.Oh(EnumErrorCodeType.s404, "鎶ュ悕淇℃伅"); + return model; } } } -- Gitblit v1.9.1