From 09d39bd7f1bfc72b78e0060c197562610a0ca9f8 Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期五, 05 九月 2025 14:37:36 +0800
Subject: [PATCH] feat:开发
---
FlexJobApi.FlexJobServer.Application/TaskUsers/Queries/TaskUserQueryHandler.cs | 33 ++++++++++++++++++++-------------
1 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/FlexJobApi.FlexJobServer.Application/TaskUsers/Queries/TaskUserQueryHandler.cs b/FlexJobApi.FlexJobServer.Application/TaskUsers/Queries/TaskUserQueryHandler.cs
index e051adb..48fb9d7 100644
--- a/FlexJobApi.FlexJobServer.Application/TaskUsers/Queries/TaskUserQueryHandler.cs
+++ b/FlexJobApi.FlexJobServer.Application/TaskUsers/Queries/TaskUserQueryHandler.cs
@@ -168,9 +168,10 @@
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);
- var s = q
+ list.Data = q
.Select(it => new GetSettlementTaskUsersQueryResultItem
{
Id = it.Id,
@@ -184,8 +185,8 @@
SettlementAmount = it.SettlementAmount,
ActualSettlementAmount = it.ActualSettlementAmount,
SettlementTime = it.SettlementTime
- });
- var list = await request.PageModel.GetPagedListAsync<GetSettlementTaskUsersQueryResult, GetSettlementTaskUsersQueryResultItem>(s, cancellationToken);
+ })
+ .ToList();
var successList = new List<GetSettlementTaskUsersQueryResultExcelRow>();
if (request.SettlementOrderUrl.IsNotNull())
@@ -234,7 +235,7 @@
{
errors.Add("瀹炲彂閲戦涓嶅彲涓鸿礋鏁�");
}
- else if (model.ActualSettlementAmount > 0 && model.ActualSettlementAmount < 1)
+ else if (model.ActualSettlementAmount > 0 && model.ActualSettlementAmount < (decimal)0.3)
{
errors.Add("瀹炲彂閲戦涓嶅彲灏忎簬1鍏�");
}
@@ -247,6 +248,10 @@
else if (item.CheckReceiveStatus != EnumTaskCheckReceiveStatus.Completed)
{
errors.Add("鏈畬鎴愰獙鏀�");
+ }
+ else if (item.Name != model.Name)
+ {
+ errors.Add("鐏靛伐濮撳悕涓庡疄鍚嶄俊鎭笉涓�鑷�");
}
else
{
@@ -268,16 +273,18 @@
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();
+ }
+ }
return list;
}
--
Gitblit v1.9.1