From ad63bd48b1619e7c3779eefdf1d6a32a222169da Mon Sep 17 00:00:00 2001 From: sunpengfei <i@angelzzz.com> Date: 星期二, 09 九月 2025 09:33:19 +0800 Subject: [PATCH] feat:开发 --- FlexJobApi.FlexJobServer.Application/TaskUsers/Queries/TaskUserQueryHandler.cs | 38 ++++++++++++++++++++++++++++++++------ 1 files changed, 32 insertions(+), 6 deletions(-) diff --git a/FlexJobApi.FlexJobServer.Application/TaskUsers/Queries/TaskUserQueryHandler.cs b/FlexJobApi.FlexJobServer.Application/TaskUsers/Queries/TaskUserQueryHandler.cs index e9e64e6..2ee2a19 100644 --- a/FlexJobApi.FlexJobServer.Application/TaskUsers/Queries/TaskUserQueryHandler.cs +++ b/FlexJobApi.FlexJobServer.Application/TaskUsers/Queries/TaskUserQueryHandler.cs @@ -11,6 +11,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; +using TaskInfo = FlexJobApi.Core.TaskInfo; namespace FlexJobApi.FlexJobServer.Application { @@ -18,13 +19,16 @@ /// 浠诲姟浜哄憳鏌ヨ澶勭悊鍣� /// </summary> public class TaskUserQueryHandler( - IRepository<TaskInfoUser> rep) : + 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绔煡璇㈠簲鑱樻姤鍚嶅垎椤靛垪琛ㄤ俊鎭� @@ -184,7 +188,8 @@ ReceiveAccount = it.ReceiveAccount, SettlementAmount = it.SettlementAmount, ActualSettlementAmount = it.ActualSettlementAmount, - SettlementTime = it.SettlementTime + SettlementTime = it.SettlementTime, + SettlementStatus = it.SettlementStatus, }) .ToList(); @@ -249,6 +254,10 @@ { errors.Add("鏈畬鎴愰獙鏀�"); } + else if (item.Name != model.Name) + { + errors.Add("鐏靛伐濮撳悕涓庡疄鍚嶄俊鎭笉涓�鑷�"); + } else { item.SettlementAmount = model.SettlementAmount; @@ -269,11 +278,28 @@ successList.Add(model); } } - } - list.Data = list.Data - .Where(it => successList.Any(s => s.Identity == it.Identity)) - .ToList(); + 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