From 8922cdf2bf292958f839c8bcbfdc7131af1b8deb Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期五, 05 九月 2025 14:51:40 +0800
Subject: [PATCH] feat:开发
---
FlexJobApi.Core/Models/FlexJobServer/TaskUsers/Queries/GetSettlementTaskUsersQuery.cs | 5 +++++
FlexJobApi.FlexJobServer.Application/FlexJobApi.FlexJobServer.Application.xml | 2 +-
FlexJobApi.FlexJobServer.Application/TaskUsers/Queries/TaskUserQueryHandler.cs | 19 +++++++++++++++++--
FlexJobApi.Core/FlexJobApi.Core.xml | 5 +++++
4 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/FlexJobApi.Core/FlexJobApi.Core.xml b/FlexJobApi.Core/FlexJobApi.Core.xml
index 219bacd..3963c63 100644
--- a/FlexJobApi.Core/FlexJobApi.Core.xml
+++ b/FlexJobApi.Core/FlexJobApi.Core.xml
@@ -8444,6 +8444,11 @@
楠屾敹鐘舵��
</summary>
</member>
+ <member name="P:FlexJobApi.Core.GetSettlementTaskUsersQueryResultItem.SettlementStatus">
+ <summary>
+ 缁撶畻鐘舵��
+ </summary>
+ </member>
<member name="P:FlexJobApi.Core.GetSettlementTaskUsersQueryResultItem.Bank">
<summary>
鎵�灞為摱琛�
diff --git a/FlexJobApi.Core/Models/FlexJobServer/TaskUsers/Queries/GetSettlementTaskUsersQuery.cs b/FlexJobApi.Core/Models/FlexJobServer/TaskUsers/Queries/GetSettlementTaskUsersQuery.cs
index 2e4e2d1..910a179 100644
--- a/FlexJobApi.Core/Models/FlexJobServer/TaskUsers/Queries/GetSettlementTaskUsersQuery.cs
+++ b/FlexJobApi.Core/Models/FlexJobServer/TaskUsers/Queries/GetSettlementTaskUsersQuery.cs
@@ -131,6 +131,11 @@
public EnumTaskCheckReceiveStatus? CheckReceiveStatus { get; set; }
/// <summary>
+ /// 缁撶畻鐘舵��
+ /// </summary>
+ public EnumTaskSettlementStatus? SettlementStatus { get; set; }
+
+ /// <summary>
/// 鎵�灞為摱琛�
/// </summary>
public string Bank { get; set; }
diff --git a/FlexJobApi.FlexJobServer.Application/FlexJobApi.FlexJobServer.Application.xml b/FlexJobApi.FlexJobServer.Application/FlexJobApi.FlexJobServer.Application.xml
index b49a0de..be372e2 100644
--- a/FlexJobApi.FlexJobServer.Application/FlexJobApi.FlexJobServer.Application.xml
+++ b/FlexJobApi.FlexJobServer.Application/FlexJobApi.FlexJobServer.Application.xml
@@ -312,7 +312,7 @@
浠诲姟浜哄憳鏌ヨ澶勭悊鍣�
</summary>
</member>
- <member name="M:FlexJobApi.FlexJobServer.Application.TaskUserQueryHandler.#ctor(Furion.DatabaseAccessor.IRepository{FlexJobApi.Core.TaskInfoUser})">
+ <member name="M:FlexJobApi.FlexJobServer.Application.TaskUserQueryHandler.#ctor(Furion.DatabaseAccessor.IRepository{FlexJobApi.Core.TaskInfoUser},Furion.DatabaseAccessor.IRepository{FlexJobApi.Core.TaskInfo})">
<summary>
浠诲姟浜哄憳鏌ヨ澶勭悊鍣�
</summary>
diff --git a/FlexJobApi.FlexJobServer.Application/TaskUsers/Queries/TaskUserQueryHandler.cs b/FlexJobApi.FlexJobServer.Application/TaskUsers/Queries/TaskUserQueryHandler.cs
index 48fb9d7..b3edb1c 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();
@@ -285,6 +290,16 @@
.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