From a17848fca2fd7643951e2342a8985e249ec7b93f Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期二, 09 九月 2025 15:38:54 +0800
Subject: [PATCH] feat:开发
---
FlexJobApi.FlexJobServer.Application/TaskUsers/Queries/TaskUserQueryHandler.cs | 66 ++++++++++++++++++++++++++-------
1 files changed, 52 insertions(+), 14 deletions(-)
diff --git a/FlexJobApi.FlexJobServer.Application/TaskUsers/Queries/TaskUserQueryHandler.cs b/FlexJobApi.FlexJobServer.Application/TaskUsers/Queries/TaskUserQueryHandler.cs
index e051adb..2cdd47e 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绔煡璇㈠簲鑱樻姤鍚嶅垎椤靛垪琛ㄤ俊鎭�
@@ -168,9 +172,15 @@
public async Task<GetSettlementTaskUsersQueryResult> Handle(GetSettlementTaskUsersQuery request, CancellationToken cancellationToken)
{
var logier = JwtUtils.GetCurrentLogier();
+ var list = new GetSettlementTaskUsersQueryResult();
+
+ list.Detail = await TaskInfoRepository.GetQueryable(repTaskInfo, true, logier)
+ .Where(it => it.Id == request.TaskInfoId)
+ .GetDetail<TaskInfo, GetSettlementTaskQueryResult>();
+
var q = rep.AsQueryable().AsNoTracking()
.Where(it => it.TaskInfoId == request.TaskInfoId);
- var s = q
+ list.Data = q
.Select(it => new GetSettlementTaskUsersQueryResultItem
{
Id = it.Id,
@@ -183,9 +193,10 @@
ReceiveAccount = it.ReceiveAccount,
SettlementAmount = it.SettlementAmount,
ActualSettlementAmount = it.ActualSettlementAmount,
- SettlementTime = it.SettlementTime
- });
- var list = await request.PageModel.GetPagedListAsync<GetSettlementTaskUsersQueryResult, GetSettlementTaskUsersQueryResultItem>(s, cancellationToken);
+ SettlementTime = it.SettlementTime,
+ SettlementStatus = it.SettlementStatus,
+ })
+ .ToList();
var successList = new List<GetSettlementTaskUsersQueryResultExcelRow>();
if (request.SettlementOrderUrl.IsNotNull())
@@ -248,6 +259,10 @@
{
errors.Add("鏈畬鎴愰獙鏀�");
}
+ else if (item.Name != model.Name)
+ {
+ errors.Add("鐏靛伐濮撳悕涓庡疄鍚嶄俊鎭笉涓�鑷�");
+ }
else
{
item.SettlementAmount = model.SettlementAmount;
@@ -255,6 +270,10 @@
item.ReceiveAccount = model.ReceiveAccount;
item.Bank = model.Bank;
item.BankBranch = model.BankBranch;
+ }
+ if (model.TaskName != list.Detail.Name)
+ {
+ errors.Add("浠诲姟鍚嶇О涓嶄竴鑷�");
}
if (errors.IsNotNull())
@@ -268,16 +287,35 @@
successList.Add(model);
}
}
- }
- var pagedList = await list.Data
- .Where(it => successList.Any(s => s.Identity == it.Identity))
- .AsQueryable()
- .ToPagedListAsync(request.PageModel.Page, request.PageModel.Rows, cancellationToken);
- list.PageModel = request.PageModel.Adapt<PagedListQueryResultPageModel>();
- list.PageModel.TotalCount = pagedList.TotalCount;
- list.PageModel.TotalPage = pagedList.TotalPages;
- list.Data = pagedList.Items.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();
+ }
+
+ list.Detail.SettlementOrderStatus = EnumTaskSettlementOrderStatus.Wait;
+ list.Detail.SettlementOrderName = request.SettlementOrderUrl.Substring(request.SettlementOrderUrl.LastIndexOf("/") + 1);
+ list.Detail.SettlementOrderTime = DateTime.Now;
+ list.Detail.SettlementStatus = EnumTaskSettlementStatus.Wait;
+ list.Detail.SettlementAmount = list.Data.Sum(it => it.SettlementAmount ?? 0);
+ list.Detail.ActualSettlementAmount = list.Data.Sum(it => it.ActualSettlementAmount ?? 0);
+ }
+ 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