From b8cf451145b72ff7ce728c101adad3574e722697 Mon Sep 17 00:00:00 2001 From: zhengyiming <540361168@qq.com> Date: 星期二, 09 九月 2025 08:59:50 +0800 Subject: [PATCH] fix: s --- FlexJobApi.FlexJobServer.Application/TaskUsers/Queries/TaskUserQueryHandler.cs | 263 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 256 insertions(+), 7 deletions(-) diff --git a/FlexJobApi.FlexJobServer.Application/TaskUsers/Queries/TaskUserQueryHandler.cs b/FlexJobApi.FlexJobServer.Application/TaskUsers/Queries/TaskUserQueryHandler.cs index 7c14240..2ee2a19 100644 --- a/FlexJobApi.FlexJobServer.Application/TaskUsers/Queries/TaskUserQueryHandler.cs +++ b/FlexJobApi.FlexJobServer.Application/TaskUsers/Queries/TaskUserQueryHandler.cs @@ -1,5 +1,9 @@ -锘縰sing FlexJobApi.Core; +锘縰sing Aop.Api.Domain; +using FlexJobApi.Core; using Furion.DatabaseAccessor; +using Furion.DataValidation; +using Furion.FriendlyException; +using Mapster; using MediatR; using Microsoft.EntityFrameworkCore; using System; @@ -7,17 +11,24 @@ using System.Linq; using System.Text; using System.Threading.Tasks; +using TaskInfo = FlexJobApi.Core.TaskInfo; namespace FlexJobApi.FlexJobServer.Application { /// <summary> - /// 浠诲姟闆囦剑鏌ヨ澶勭悊鍣� + /// 浠诲姟浜哄憳鏌ヨ澶勭悊鍣� /// </summary> public class TaskUserQueryHandler( - IRepository<TaskInfoUser> rep) - : IRequestHandler<GetTaskUsersQuery, GetTaskUsersQueryResult> + IRepository<TaskInfoUser> rep, + IRepository<TaskInfo> repTaskInfo + ) : + IRequestHandler<GetTaskUsersQuery, GetTaskUsersQueryResult>, + IRequestHandler<GetArrangeTaskUsersQuery, GetArrangeTaskUsersQueryResult>, + IRequestHandler<GetTaskUserHireStatusQuery, GetTaskUserHireStatusQueryResult>, + IRequestHandler<GetSettlementTaskUsersQuery, GetSettlementTaskUsersQueryResult> { private readonly IRepository<TaskInfoUser> rep = rep; + private readonly IRepository<TaskInfo> repTaskInfo = repTaskInfo; /// <summary> /// B绔煡璇㈠簲鑱樻姤鍚嶅垎椤靛垪琛ㄤ俊鎭� @@ -31,8 +42,72 @@ 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, + ContactPhoneNumber = it.EnterpriseEmployee.User.ContactPhoneNumber, + Gender = it.EnterpriseEmployee.User.Gender, + Age = it.EnterpriseEmployee.User.Age, + IsReal = it.EnterpriseEmployee.User.IsReal, + RealMethod = it.EnterpriseEmployee.User.RealMethod, + PersonalIdentityCode = it.EnterpriseEmployee.User.PersonalIdentityCode, + PersonalIdentityContent = it.EnterpriseEmployee.User.PersonalIdentity.Content, + EducationalBackgroundCode = it.EnterpriseEmployee.User.EducationalBackgroundCode, + EducationalBackgroundContent = it.EnterpriseEmployee.User.EducationalBackground.Content, + TaskCount = it.EnterpriseEmployee.TaskInfoUsers.Count(tu => tu.HireStatus == EnumTaskUserHireStatus.Pass), + WorkSeniority = it.EnterpriseEmployee.User.WorkSeniority, + WorkExperience = it.EnterpriseEmployee.User.WorkExperience, + HireStatus = it.HireStatus + }); + return await request.PageModel.GetPagedListAsync<GetTaskUsersQueryResult, GetTaskUsersQueryResultItem>(s, cancellationToken); + } + + /// <summary> + /// B绔煡璇汉鍛樺畨鎺掑垎椤靛垪琛ㄤ俊鎭� + /// </summary> + /// <param name="request"></param> + /// <param name="cancellationToken"></param> + /// <returns></returns> + public async Task<GetArrangeTaskUsersQueryResult> Handle(GetArrangeTaskUsersQuery request, CancellationToken cancellationToken) + { + var logier = JwtUtils.GetCurrentLogier(); + var q = rep.AsQueryable().AsNoTracking() + .OrderBy(it => it.CreatedTime) + .Where(it => + it.TaskInfo.EnterpriseId == logier.EnterpriseId + && it.TaskInfoId == request.Id + && 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); + } + 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)); + } + var s = q + .Select(it => new GetArrangeTaskUsersQueryResultItem { Id = it.Id, Avatar = it.EnterpriseEmployee.User.Avatar, @@ -47,12 +122,186 @@ PersonalIdentityContent = it.EnterpriseEmployee.User.PersonalIdentity.Content, EducationalBackgroundCode = it.EnterpriseEmployee.User.EducationalBackgroundCode, EducationalBackgroundContent = it.EnterpriseEmployee.User.EducationalBackground.Content, - TaskCount = it.EnterpriseEmployee.User.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 + ArrangeStatus = it.ArrangeStatus }); - return await request.PageModel.GetPagedListAsync<GetTaskUsersQueryResult, GetTaskUsersQueryResultItem>(s, cancellationToken); + 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; + } + + /// <summary> + /// 鏌ヨ缁撶畻鍚嶅崟鍒嗛〉鍒楄〃鏁版嵁 + /// </summary> + /// <param name="request"></param> + /// <param name="cancellationToken"></param> + /// <returns></returns> + public async Task<GetSettlementTaskUsersQueryResult> Handle(GetSettlementTaskUsersQuery request, CancellationToken cancellationToken) + { + var logier = JwtUtils.GetCurrentLogier(); + var list = new GetSettlementTaskUsersQueryResult(); + var q = rep.AsQueryable().AsNoTracking() + .Where(it => it.TaskInfoId == request.TaskInfoId); + list.Data = q + .Select(it => new GetSettlementTaskUsersQueryResultItem + { + Id = it.Id, + Name = it.EnterpriseEmployee.Name, + Identity = it.EnterpriseEmployee.Identity, + ContactPhoneNumber = it.EnterpriseEmployee.ContactPhoneNumber, + CheckReceiveStatus = it.CheckReceiveStatus, + Bank = it.Bank, + BankBranch = it.BankBranch, + ReceiveAccount = it.ReceiveAccount, + SettlementAmount = it.SettlementAmount, + ActualSettlementAmount = it.ActualSettlementAmount, + SettlementTime = it.SettlementTime, + SettlementStatus = it.SettlementStatus, + }) + .ToList(); + + var successList = new List<GetSettlementTaskUsersQueryResultExcelRow>(); + if (request.SettlementOrderUrl.IsNotNull()) + { + var models = await ExcelUtils.ImportExcelFromOSS<GetSettlementTaskUsersQueryResultExcelRow>(request.SettlementOrderUrl); + foreach (var model in models) + { + var errors = new List<string>(); + if (model.Name.IsNull()) + { + errors.Add("璇峰~鍐欏鍚�"); + } + if (model.Identity.IsNull()) + { + errors.Add("璇峰~鍐欒韩浠借瘉鍙�"); + } + else if (!model.Identity.TryValidate(EnumValidationTypes.ValiIdentity).IsValid) + { + errors.Add("韬唤璇佸彿鏍煎紡涓嶆纭�"); + } + else if (successList.Any(it => it.Identity == model.Identity)) + { + errors.Add("韬唤璇佸彿閲嶅"); + } + if (model.Bank.IsNull()) + { + errors.Add("璇峰~鍐欐墍灞為摱琛�"); + } + if (model.ReceiveAccount.IsNull()) + { + errors.Add("璇峰~鍐欐敹娆捐处鍙�"); + } + if (model.SettlementAmount == null) + { + errors.Add("璇峰~鍐欑粨绠楅噾棰�"); + } + else if (model.SettlementAmount < 0) + { + errors.Add("缁撶畻閲戦涓嶅彲涓鸿礋鏁�"); + } + if (model.ActualSettlementAmount == null) + { + errors.Add("璇峰~鍐欏疄鍙戦噾棰�"); + } + else if (model.ActualSettlementAmount < 0) + { + errors.Add("瀹炲彂閲戦涓嶅彲涓鸿礋鏁�"); + } + else if (model.ActualSettlementAmount > 0 && model.ActualSettlementAmount < 1) + { + errors.Add("瀹炲彂閲戦涓嶅彲灏忎簬1鍏�"); + } + + var item = list.Data.FirstOrDefault(it => it.Identity == model.Identity); + if (item == null) + { + errors.Add("鐏靛伐涓嶅瓨鍦�"); + } + else if (item.CheckReceiveStatus != EnumTaskCheckReceiveStatus.Completed) + { + errors.Add("鏈畬鎴愰獙鏀�"); + } + else if (item.Name != model.Name) + { + errors.Add("鐏靛伐濮撳悕涓庡疄鍚嶄俊鎭笉涓�鑷�"); + } + else + { + item.SettlementAmount = model.SettlementAmount; + item.ActualSettlementAmount = model.ActualSettlementAmount; + item.ReceiveAccount = model.ReceiveAccount; + item.Bank = model.Bank; + item.BankBranch = model.BankBranch; + } + + if (errors.IsNotNull()) + { + var error = model.Adapt<GetSettlementTaskUsersQueryResultError>(); + error.ErrorMessage = errors.SplitJoin("锛�"); + list.Errors.Add(error); + } + else + { + successList.Add(model); + } + } + + if (list.Errors.IsNotNull()) + { + list.Data = new List<GetSettlementTaskUsersQueryResultItem>(); + } + else + { + list.Data = list.Data + .Where(it => successList.Any(s => s.Identity == it.Identity)) + .ToList(); + } + } + else + { + var task = await repTaskInfo.AsQueryable().AsNoTracking() + .Where(it => it.Id == request.TaskInfoId) + .FirstOrDefaultAsync(); + if (task == null) throw Oops.Oh(EnumErrorCodeType.s404, "浠诲姟"); + list.Data = list.Data + .Where(it => it.SettlementStatus == task.SettlementStatus) + .ToList(); + } + + return list; } } } -- Gitblit v1.9.1