From 1b84c97dd1cf5a746c5bbb185a0b7400b7f5ca24 Mon Sep 17 00:00:00 2001 From: sunpengfei <i@angelzzz.com> Date: 星期五, 15 八月 2025 10:08:40 +0800 Subject: [PATCH] pref:优化 --- FlexJobApi.FlexJobServer.Application/TaskUsers/Queries/TaskUserQueryHandler.cs | 65 ++++++++++++++++++++++++++++---- 1 files changed, 56 insertions(+), 9 deletions(-) diff --git a/FlexJobApi.FlexJobServer.Application/TaskUsers/Queries/TaskUserQueryHandler.cs b/FlexJobApi.FlexJobServer.Application/TaskUsers/Queries/TaskUserQueryHandler.cs index 1f0172b..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; @@ -14,9 +15,10 @@ /// 浠诲姟浜哄憳鏌ヨ澶勭悊鍣� /// </summary> public class TaskUserQueryHandler( - IRepository<TaskInfoUser> rep) : + IRepository<TaskInfoUser> rep) : IRequestHandler<GetTaskUsersQuery, GetTaskUsersQueryResult>, - IRequestHandler<GetArrangeTaskUsersQuery, GetArrangeTaskUsersQueryResult> + IRequestHandler<GetArrangeTaskUsersQuery, GetArrangeTaskUsersQueryResult>, + IRequestHandler<GetTaskUserHireStatusQuery, GetTaskUserHireStatusQueryResult> { private readonly IRepository<TaskInfoUser> rep = rep; @@ -32,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, @@ -48,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); } @@ -67,15 +81,15 @@ var logier = JwtUtils.GetCurrentLogier(); var q = rep.AsQueryable().AsNoTracking() .OrderBy(it => it.CreatedTime) - .Where(it => - it.TaskInfo.EnterpriseId == logier.EnterpriseId + .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) { - q = q.Where(it=>it.ArrangeStatus == request.ArrangeStatus); + q = q.Where(it => it.ArrangeStatus == request.ArrangeStatus); } if (request.Keywords.IsNotNull()) { @@ -100,12 +114,45 @@ 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 }); return await request.PageModel.GetPagedListAsync<GetArrangeTaskUsersQueryResult, GetArrangeTaskUsersQueryResultItem>(s, cancellationToken); } + + /// <summary> + /// 鏌ヨ搴旇仒鎶ュ悕浜哄憳褰曠敤鐘舵�� + /// </summary> + /// <param name="request"></param> + /// <param name="cancellationToken"></param> + /// <returns></returns> + public async Task<GetTaskUserHireStatusQueryResult> Handle(GetTaskUserHireStatusQuery request, CancellationToken cancellationToken) + { + var logier = JwtUtils.GetCurrentLogier(); + var q = rep.AsQueryable().AsNoTracking() + .Where(it => it.TaskInfoId == request.TaskInfoId); + if (logier.Type == EnumUserType.Personal) + { + q = q.Where(it => it.EnterpriseEmployee.UserId == request.UserId); + } + else if (request.UserId == null) + { + throw Oops.Oh(EnumErrorCodeType.s400, "璇烽�夋嫨鐢ㄦ埛"); + } + else + { + q = q.Where(it => it.EnterpriseEmployee.UserId == request.UserId); + } + 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