From 295f9f543d9a7224eacf91e8fadfbf1a89a2ddad Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期三, 13 八月 2025 15:56:07 +0800
Subject: [PATCH] feat:开发
---
FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskCheckReceiveQueryHandler.cs | 10 ++++++++++
FlexJobApi.Core/Models/FlexJobServer/TaskCheckReceive/Queries/GetCheckReceiveTasksQuery.cs | 10 ++++++++++
FlexJobApi.Core/FlexJobApi.Core.xml | 19 +++++++++++++++++--
FlexJobApi.Core/Models/FlexJobServer/Tasks/Queries/GetTaskInfosQuery.cs | 2 +-
FlexJobApi.FlexJobServer.Application/Tasks/Queries/TaskInfoQueryHandler.cs | 2 +-
5 files changed, 39 insertions(+), 4 deletions(-)
diff --git a/FlexJobApi.Core/FlexJobApi.Core.xml b/FlexJobApi.Core/FlexJobApi.Core.xml
index 6ded59e..c42247f 100644
--- a/FlexJobApi.Core/FlexJobApi.Core.xml
+++ b/FlexJobApi.Core/FlexJobApi.Core.xml
@@ -4005,9 +4005,24 @@
鏌ヨ楠屾敹鎻愪氦璇︽儏
</summary>
</member>
- <member name="P:FlexJobApi.Core.GetCheckReceiveTaskUserSubmitQuery.Id">
+ <member name="P:FlexJobApi.Core.GetCheckReceiveTaskUserSubmitQuery.SubmitId">
<summary>
- 鎻愪氦Id
+ 鎻愪氦Id锛堢敤浜嶣绔鎴风锛�
+ </summary>
+ </member>
+ <member name="P:FlexJobApi.Core.GetCheckReceiveTaskUserSubmitQuery.TaskInfoId">
+ <summary>
+ 浠诲姟Id锛堢敤浜嶤绔皬绋嬪簭缂栬緫鎻愪氦 鍜屾棩鏈熶竴璧蜂紶锛�
+ </summary>
+ </member>
+ <member name="P:FlexJobApi.Core.GetCheckReceiveTaskUserSubmitQuery.TaskInfoUserId">
+ <summary>
+ 浠诲姟浜哄憳Id锛堢敤浜嶣绔皬绋嬪簭楠屾敹 鍜屾棩鏈熶竴璧蜂紶锛�
+ </summary>
+ </member>
+ <member name="P:FlexJobApi.Core.GetCheckReceiveTaskUserSubmitQuery.Date">
+ <summary>
+ 鏃ユ湡锛堢敤浜庝袱涓皬绋嬪簭 璺熸煇涓�涓狪d涓�璧蜂紶锛�
</summary>
</member>
<member name="T:FlexJobApi.Core.GetCheckReceiveTaskUserSubmitQueryResult">
diff --git a/FlexJobApi.Core/Models/FlexJobServer/TaskCheckReceive/Queries/GetCheckReceiveTasksQuery.cs b/FlexJobApi.Core/Models/FlexJobServer/TaskCheckReceive/Queries/GetCheckReceiveTasksQuery.cs
index fb7d1de..8501c31 100644
--- a/FlexJobApi.Core/Models/FlexJobServer/TaskCheckReceive/Queries/GetCheckReceiveTasksQuery.cs
+++ b/FlexJobApi.Core/Models/FlexJobServer/TaskCheckReceive/Queries/GetCheckReceiveTasksQuery.cs
@@ -19,6 +19,11 @@
public DateTime? Date { get; set; }
/// <summary>
+ /// 鍏抽敭瀛楋紙濮撳悕/鎵嬫満/韬唤璇佸彿锛�
+ /// </summary>
+ public string Keywords { get; set; }
+
+ /// <summary>
/// 楠屾敹鏃ユ湡-鏈�鏃╂椂闂达紙B绔鎴风-楠屾敹绠＄悊涓撶敤锛�
/// </summary>
public DateTime? CheckReceiveTimeBegin { get; set; }
@@ -78,6 +83,11 @@
public EnumSettlementCycle SettlementCycle { get; set; }
/// <summary>
+ /// 鍙戝竷鏃堕棿
+ /// </summary>
+ public DateTimeOffset CreatedTime { get; set; }
+
+ /// <summary>
/// 浠诲姟寮�濮嬫椂闂�
/// </summary>
public DateTime BeginTime { get; set; }
diff --git a/FlexJobApi.Core/Models/FlexJobServer/Tasks/Queries/GetTaskInfosQuery.cs b/FlexJobApi.Core/Models/FlexJobServer/Tasks/Queries/GetTaskInfosQuery.cs
index 2c8f722..805fb6d 100644
--- a/FlexJobApi.Core/Models/FlexJobServer/Tasks/Queries/GetTaskInfosQuery.cs
+++ b/FlexJobApi.Core/Models/FlexJobServer/Tasks/Queries/GetTaskInfosQuery.cs
@@ -242,7 +242,7 @@
public EnumTaskRecommendStatus RecommendStatus { get; set; }
/// <summary>
- /// 鍒涘缓鏃堕棿
+ /// 鍙戝竷鏃堕棿
/// </summary>
public DateTimeOffset CreatedTime { get; set; }
}
diff --git a/FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskCheckReceiveQueryHandler.cs b/FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskCheckReceiveQueryHandler.cs
index 8bb400a..e6941db 100644
--- a/FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskCheckReceiveQueryHandler.cs
+++ b/FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskCheckReceiveQueryHandler.cs
@@ -49,6 +49,14 @@
{
q = q.Where(it => it.EnterpriseId == logier.EnterpriseId);
}
+ if (request.Keywords.IsNotNull())
+ {
+ q = q.Where(it =>
+ it.TaskInfoUsers.Any(tu =>
+ tu.EnterpriseEmployee.User.Name.Contains(request.Keywords)
+ || tu.EnterpriseEmployee.User.PhoneNumber.Contains(request.Keywords)
+ || tu.EnterpriseEmployee.User.Identity.Contains(request.Keywords)));
+ }
if (logier.ClientType == EnumClientType.Wxmp)
{
if (request.CheckReceiveStatus == null)
@@ -156,6 +164,8 @@
result.ObjectData = await repTaskInfoUser.AsQueryable().AsNoTracking()
.Where(it => it.Id == request.Id)
.GetDetail<TaskInfoUser, GetCheckReceiveTaskUserSubmitsQueryResultObjectData>();
+
+ await repTaskInfo.Change<UserBankCard>()
return result;
}
diff --git a/FlexJobApi.FlexJobServer.Application/Tasks/Queries/TaskInfoQueryHandler.cs b/FlexJobApi.FlexJobServer.Application/Tasks/Queries/TaskInfoQueryHandler.cs
index 294a7d4..50ab0f0 100644
--- a/FlexJobApi.FlexJobServer.Application/Tasks/Queries/TaskInfoQueryHandler.cs
+++ b/FlexJobApi.FlexJobServer.Application/Tasks/Queries/TaskInfoQueryHandler.cs
@@ -118,7 +118,7 @@
}
if (request.BeginTime.HasValue && request.EndTime.HasValue)
{
- q = q.Where(it => request.BeginTime <= it.BeginTime && it.BeginTime <= request.EndTime);
+ q = q.Where(it => request.BeginTime <= it.CreatedTime && it.CreatedTime <= request.EndTime);
}
if (request.CityCode.IsNotNull())
{
--
Gitblit v1.9.1