From c1bff84f284ee912a3db6b866be3916e1d762a90 Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期三, 13 八月 2025 13:07:48 +0800
Subject: [PATCH] feat:开发
---
FlexJobApi.Core/Entities/FlexJobServer/Tasks/TaskInfoUser.cs | 5
/dev/null | 116 -------
FlexJobApi.Core/Entities/FlexJobServer/Tasks/TaskInfo.cs | 15 +
FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskUserSubmitQueryHandler.cs | 104 +-----
FlexJobApi.Core/Models/FlexJobServer/TaskCheckReceive/Queries/GetCheckReceiveTaskUserSubmitsQuery.cs | 33 ++
FlexJobApi.FlexJobServer.Application/FlexJobApi.FlexJobServer.Application.xml | 6
FlexJobApi.FlexJobServer.Application/TaskUsers/Queries/TaskUserQueryHandler.cs | 1
FlexJobApi.Core/Models/FlexJobServer/TaskCheckReceive/Queries/GetCheckReceiveTasksQuery.cs | 106 +++++++
FlexJobApi.Core/FlexJobApi.Core.xml | 351 ++++++++++++++++-------
FlexJobApi.Core/Models/FlexJobServer/TaskCheckReceive/Queries/GetCheckReceiveTaskQuery.cs | 125 ++++++-
10 files changed, 528 insertions(+), 334 deletions(-)
diff --git a/FlexJobApi.Core/Entities/FlexJobServer/Tasks/TaskInfo.cs b/FlexJobApi.Core/Entities/FlexJobServer/Tasks/TaskInfo.cs
index ea47cf7..570bf5f 100644
--- a/FlexJobApi.Core/Entities/FlexJobServer/Tasks/TaskInfo.cs
+++ b/FlexJobApi.Core/Entities/FlexJobServer/Tasks/TaskInfo.cs
@@ -151,6 +151,21 @@
public EnumTaskCheckReceiveStatus? CheckReceiveStatus { get; set; }
/// <summary>
+ /// 楠屾敹瀹屾垚鏃堕棿
+ /// </summary>
+ public DateTime? CheckReceiveTime { get; set; }
+
+ /// <summary>
+ /// 鏈�杩戞彁浜ゆ椂闂�
+ /// </summary>
+ public DateTime? LastSubmitTime { get; set; }
+
+ /// <summary>
+ /// 鏈�杩戦獙鏀舵椂闂�
+ /// </summary>
+ public DateTime? LastCheckReceiveTime { get; set; }
+
+ /// <summary>
/// 缁撶畻鐘舵��
/// </summary>
public EnumTaskSettlementStatus? SettlementStatus { get; set; }
diff --git a/FlexJobApi.Core/Entities/FlexJobServer/Tasks/TaskInfoUser.cs b/FlexJobApi.Core/Entities/FlexJobServer/Tasks/TaskInfoUser.cs
index be3fce3..09ec707 100644
--- a/FlexJobApi.Core/Entities/FlexJobServer/Tasks/TaskInfoUser.cs
+++ b/FlexJobApi.Core/Entities/FlexJobServer/Tasks/TaskInfoUser.cs
@@ -65,6 +65,11 @@
public DateTime? LastSubmitTime { get; set; }
/// <summary>
+ /// 鏈�杩戦獙鏀舵椂闂�
+ /// </summary>
+ public DateTime? LastCheckReceiveTime { get; set; }
+
+ /// <summary>
/// 鎻愪氦
/// </summary>
public List<TaskInfoUserSubmit> Submits { get; set; }
diff --git a/FlexJobApi.Core/FlexJobApi.Core.xml b/FlexJobApi.Core/FlexJobApi.Core.xml
index c37d4f9..f557595 100644
--- a/FlexJobApi.Core/FlexJobApi.Core.xml
+++ b/FlexJobApi.Core/FlexJobApi.Core.xml
@@ -844,6 +844,21 @@
楠屾敹鐘舵��
</summary>
</member>
+ <member name="P:FlexJobApi.Core.TaskInfo.CheckReceiveTime">
+ <summary>
+ 楠屾敹瀹屾垚鏃堕棿
+ </summary>
+ </member>
+ <member name="P:FlexJobApi.Core.TaskInfo.LastSubmitTime">
+ <summary>
+ 鏈�杩戞彁浜ゆ椂闂�
+ </summary>
+ </member>
+ <member name="P:FlexJobApi.Core.TaskInfo.LastCheckReceiveTime">
+ <summary>
+ 鏈�杩戦獙鏀舵椂闂�
+ </summary>
+ </member>
<member name="P:FlexJobApi.Core.TaskInfo.SettlementStatus">
<summary>
缁撶畻鐘舵��
@@ -952,6 +967,11 @@
<member name="P:FlexJobApi.Core.TaskInfoUser.LastSubmitTime">
<summary>
鏈�杩戞彁浜ゆ椂闂�
+ </summary>
+ </member>
+ <member name="P:FlexJobApi.Core.TaskInfoUser.LastCheckReceiveTime">
+ <summary>
+ 鏈�杩戦獙鏀舵椂闂�
</summary>
</member>
<member name="P:FlexJobApi.Core.TaskInfoUser.Submits">
@@ -3725,158 +3745,229 @@
</member>
<member name="T:FlexJobApi.Core.GetCheckReceiveTaskQuery">
<summary>
- 鏌ヨ楠屾敹浠诲姟鍒嗛〉鍒楄〃
+ 鏌ヨ楠屾敹浠诲姟璇︽儏
</summary>
</member>
- <member name="P:FlexJobApi.Core.GetCheckReceiveTaskQuery.DateBegin">
+ <member name="P:FlexJobApi.Core.GetCheckReceiveTaskQuery.TaskInfoId">
<summary>
- 楠屾敹鏃ユ湡-鏈�鏃╂椂闂�
- </summary>
- </member>
- <member name="P:FlexJobApi.Core.GetCheckReceiveTaskQuery.DateEnd">
- <summary>
- 楠屾敹鏃ユ湡-鏈�鏅氭椂闂�
- </summary>
- </member>
- <member name="P:FlexJobApi.Core.GetCheckReceiveTaskQuery.CheckReceiveStatus">
- <summary>
- 楠屾敹鐘舵��
+ 浠诲姟Id
</summary>
</member>
<member name="T:FlexJobApi.Core.GetCheckReceiveTaskQueryResult">
<summary>
- 鏌ヨ楠屾敹浠诲姟鍒嗛〉鍒楄〃-缁撴灉
+ 鏌ヨ楠屾敹浠诲姟璇︽儏-缁撴灉
+ </summary>
+ </member>
+ <member name="P:FlexJobApi.Core.GetCheckReceiveTaskQueryResult.ObjectData">
+ <summary>
+ 璇︽儏
+ </summary>
+ </member>
+ <member name="T:FlexJobApi.Core.GetCheckReceiveTaskQueryResultObjectData">
+ <summary>
+
+ 鏌ヨ楠屾敹浠诲姟璇︽儏-缁撴灉-璇︽儏
+ </summary>
+ </member>
+ <member name="P:FlexJobApi.Core.GetCheckReceiveTaskQueryResultObjectData.Name">
+ <summary>
+ 浠诲姟鍚嶇О
+ </summary>
+ </member>
+ <member name="P:FlexJobApi.Core.GetCheckReceiveTaskQueryResultObjectData.Code">
+ <summary>
+ 浠诲姟鍗曞彿
+ </summary>
+ </member>
+ <member name="P:FlexJobApi.Core.GetCheckReceiveTaskQueryResultObjectData.BillingMethod">
+ <summary>
+ 缁撶畻鍛ㄦ湡
+ </summary>
+ </member>
+ <member name="P:FlexJobApi.Core.GetCheckReceiveTaskQueryResultObjectData.ServiceFee">
+ <summary>
+ 鏈嶅姟璐�
+ </summary>
+ </member>
+ <member name="P:FlexJobApi.Core.GetCheckReceiveTaskQueryResultObjectData.SettlementCycle">
+ <summary>
+ 缁撶畻鏂瑰紡
+ </summary>
+ </member>
+ <member name="P:FlexJobApi.Core.GetCheckReceiveTaskQueryResultObjectData.BeginTime">
+ <summary>
+ 浠诲姟寮�濮嬫椂闂�
+ </summary>
+ </member>
+ <member name="P:FlexJobApi.Core.GetCheckReceiveTaskQueryResultObjectData.EndTime">
+ <summary>
+ 浠诲姟缁撴潫鏃堕棿
+ </summary>
+ </member>
+ <member name="P:FlexJobApi.Core.GetCheckReceiveTaskQueryResultObjectData.AddressName">
+ <summary>
+ 浠诲姟鍦扮偣鍚嶇О
</summary>
</member>
<member name="T:FlexJobApi.Core.GetCheckReceiveTaskQueryResultItem">
<summary>
- 鏌ヨ楠屾敹浠诲姟鍒嗛〉鍒楄〃-缁撴灉-椤�
+ 鏌ヨ楠屾敹浠诲姟璇︽儏-缁撴灉-椤�
</summary>
</member>
<member name="P:FlexJobApi.Core.GetCheckReceiveTaskQueryResultItem.Id">
<summary>
- 浠诲姟Id
+ 浠诲姟浜哄憳Id
+ </summary>
+ </member>
+ <member name="P:FlexJobApi.Core.GetCheckReceiveTaskQueryResultItem.TaskInfoName">
+ <summary>
+ 浠诲姟鍚嶇О
+ </summary>
+ </member>
+ <member name="P:FlexJobApi.Core.GetCheckReceiveTaskQueryResultItem.TaskInfoCode">
+ <summary>
+ 浠诲姟鍗曞彿
+ </summary>
+ </member>
+ <member name="P:FlexJobApi.Core.GetCheckReceiveTaskQueryResultItem.Avatar">
+ <summary>
+ 澶村儚
</summary>
</member>
<member name="P:FlexJobApi.Core.GetCheckReceiveTaskQueryResultItem.Name">
<summary>
- 浠诲姟鍚嶇О
- </summary>
- </member>
- <member name="P:FlexJobApi.Core.GetCheckReceiveTaskQueryResultItem.BeginTime">
- <summary>
- 浠诲姟寮�濮嬫椂闂�
- </summary>
- </member>
- <member name="P:FlexJobApi.Core.GetCheckReceiveTaskQueryResultItem.EndTime">
- <summary>
- 浠诲姟缁撴潫鏃堕棿
- </summary>
- </member>
- <member name="P:FlexJobApi.Core.GetCheckReceiveTaskQueryResultItem.AddressName">
- <summary>
- 浠诲姟鍦扮偣鍚嶇О
- </summary>
- </member>
- <member name="T:FlexJobApi.Core.GetCheckReceiveTaskUserQuery">
- <summary>
- 鏌ヨ楠屾敹鍒嗛〉鍒楄〃
- </summary>
- </member>
- <member name="P:FlexJobApi.Core.GetCheckReceiveTaskUserQuery.TaskInfoId">
- <summary>
- 浠诲姟Id
- </summary>
- </member>
- <member name="P:FlexJobApi.Core.GetCheckReceiveTaskUserQuery.Keywords">
- <summary>
- 鍏抽敭瀛�
- </summary>
- </member>
- <member name="P:FlexJobApi.Core.GetCheckReceiveTaskUserQuery.DateBegin">
- <summary>
- 楠屾敹鏃ユ湡-鏈�鏃╂椂闂�
- </summary>
- </member>
- <member name="P:FlexJobApi.Core.GetCheckReceiveTaskUserQuery.DateEnd">
- <summary>
- 楠屾敹鏃ユ湡-鏈�鏅氭椂闂�
- </summary>
- </member>
- <member name="P:FlexJobApi.Core.GetCheckReceiveTaskUserQuery.CheckReceiveStatus">
- <summary>
- 楠屾敹鐘舵��
- </summary>
- </member>
- <member name="T:FlexJobApi.Core.GetCheckReceiveTaskUserQueryResult">
- <summary>
- 鏌ヨ楠屾敹浠诲姟鍒嗛〉鍒楄〃-缁撴灉
- </summary>
- </member>
- <member name="T:FlexJobApi.Core.GetCheckReceiveTaskUserQueryResultItem">
- <summary>
- 鏌ヨ楠屾敹浠诲姟鍒嗛〉鍒楄〃-缁撴灉-椤�
- </summary>
- </member>
- <member name="P:FlexJobApi.Core.GetCheckReceiveTaskUserQueryResultItem.Id">
- <summary>
- 浠诲姟Id
- </summary>
- </member>
- <member name="P:FlexJobApi.Core.GetCheckReceiveTaskUserQueryResultItem.TaskName">
- <summary>
- 浠诲姟鍚嶇О
- </summary>
- </member>
- <member name="P:FlexJobApi.Core.GetCheckReceiveTaskUserQueryResultItem.BeginTime">
- <summary>
- 浠诲姟寮�濮嬫椂闂�
- </summary>
- </member>
- <member name="P:FlexJobApi.Core.GetCheckReceiveTaskUserQueryResultItem.EndTime">
- <summary>
- 浠诲姟缁撴潫鏃堕棿
- </summary>
- </member>
- <member name="P:FlexJobApi.Core.GetCheckReceiveTaskUserQueryResultItem.AddressName">
- <summary>
- 浠诲姟鍦扮偣鍚嶇О
- </summary>
- </member>
- <member name="P:FlexJobApi.Core.GetCheckReceiveTaskUserQueryResultItem.Name">
- <summary>
濮撳悕
</summary>
</member>
- <member name="P:FlexJobApi.Core.GetCheckReceiveTaskUserQueryResultItem.Identity">
+ <member name="P:FlexJobApi.Core.GetCheckReceiveTaskQueryResultItem.Identity">
<summary>
韬唤璇佸彿
</summary>
</member>
- <member name="P:FlexJobApi.Core.GetCheckReceiveTaskUserQueryResultItem.Gender">
+ <member name="P:FlexJobApi.Core.GetCheckReceiveTaskQueryResultItem.Gender">
<summary>
鎬у埆
</summary>
</member>
- <member name="P:FlexJobApi.Core.GetCheckReceiveTaskUserQueryResultItem.Age">
+ <member name="P:FlexJobApi.Core.GetCheckReceiveTaskQueryResultItem.Age">
<summary>
骞撮緞
</summary>
</member>
- <member name="P:FlexJobApi.Core.GetCheckReceiveTaskUserQueryResultItem.ContactPhoneNumber">
+ <member name="P:FlexJobApi.Core.GetCheckReceiveTaskQueryResultItem.ContactPhoneNumber">
<summary>
鎵嬫満鍙�
</summary>
<remarks>鑱旂郴鐢佃瘽</remarks>
</member>
- <member name="P:FlexJobApi.Core.GetCheckReceiveTaskUserQueryResultItem.LastSubmitTime">
+ <member name="P:FlexJobApi.Core.GetCheckReceiveTaskQueryResultItem.IsReal">
<summary>
- 鎻愪氦鏃堕棿
+ 鏄惁瀹炲悕
</summary>
</member>
- <member name="P:FlexJobApi.Core.GetCheckReceiveTaskUserQueryResultItem.CheckReceiveStatus">
+ <member name="P:FlexJobApi.Core.GetCheckReceiveTaskQueryResultItem.RealMethod">
+ <summary>
+ 瀹炲悕鏂瑰紡
+ </summary>
+ </member>
+ <member name="P:FlexJobApi.Core.GetCheckReceiveTaskQueryResultItem.LastSubmitTime">
+ <summary>
+ 鏈�杩戞彁浜ゆ椂闂�
+ </summary>
+ </member>
+ <member name="P:FlexJobApi.Core.GetCheckReceiveTaskQueryResultItem.CheckReceiveStatus">
<summary>
楠屾敹鐘舵��
+ </summary>
+ </member>
+ <member name="T:FlexJobApi.Core.GetCheckReceiveTasksQuery">
+ <summary>
+ 鏌ヨ楠屾敹浠诲姟鍒嗛〉鍒楄〃
+ </summary>
+ </member>
+ <member name="P:FlexJobApi.Core.GetCheckReceiveTasksQuery.Date">
+ <summary>
+ 鏃ユ湡锛堝皬绋嬪簭-楠屾敹绠＄悊涓撶敤锛�
+ </summary>
+ </member>
+ <member name="P:FlexJobApi.Core.GetCheckReceiveTasksQuery.CheckReceiveTimeBegin">
+ <summary>
+ 楠屾敹鏃ユ湡-鏈�鏃╂椂闂达紙B绔鎴风-楠屾敹绠＄悊涓撶敤锛�
+ </summary>
+ </member>
+ <member name="P:FlexJobApi.Core.GetCheckReceiveTasksQuery.CheckReceiveTimeEnd">
+ <summary>
+ 楠屾敹鏃ユ湡-鏈�鏅氭椂闂达紙B绔鎴风-楠屾敹绠＄悊涓撶敤锛�
+ </summary>
+ </member>
+ <member name="P:FlexJobApi.Core.GetCheckReceiveTasksQuery.CheckReceiveStatus">
+ <summary>
+ 楠屾敹鐘舵��
+ </summary>
+ </member>
+ <member name="T:FlexJobApi.Core.GetCheckReceiveTasksQueryResult">
+ <summary>
+ 鏌ヨ楠屾敹浠诲姟鍒嗛〉鍒楄〃-缁撴灉
+ </summary>
+ </member>
+ <member name="T:FlexJobApi.Core.GetCheckReceiveTasksQueryResultItem">
+ <summary>
+ 鏌ヨ楠屾敹浠诲姟鍒嗛〉鍒楄〃-缁撴灉-椤�
+ </summary>
+ </member>
+ <member name="P:FlexJobApi.Core.GetCheckReceiveTasksQueryResultItem.Id">
+ <summary>
+ 浠诲姟Id
+ </summary>
+ </member>
+ <member name="P:FlexJobApi.Core.GetCheckReceiveTasksQueryResultItem.Name">
+ <summary>
+ 浠诲姟鍚嶇О
+ </summary>
+ </member>
+ <member name="P:FlexJobApi.Core.GetCheckReceiveTasksQueryResultItem.Code">
+ <summary>
+ 浠诲姟鍗曞彿
+ </summary>
+ </member>
+ <member name="P:FlexJobApi.Core.GetCheckReceiveTasksQueryResultItem.BillingMethod">
+ <summary>
+ 缁撶畻鍛ㄦ湡
+ </summary>
+ </member>
+ <member name="P:FlexJobApi.Core.GetCheckReceiveTasksQueryResultItem.ServiceFee">
+ <summary>
+ 鏈嶅姟璐�
+ </summary>
+ </member>
+ <member name="P:FlexJobApi.Core.GetCheckReceiveTasksQueryResultItem.SettlementCycle">
+ <summary>
+ 缁撶畻鏂瑰紡
+ </summary>
+ </member>
+ <member name="P:FlexJobApi.Core.GetCheckReceiveTasksQueryResultItem.BeginTime">
+ <summary>
+ 浠诲姟寮�濮嬫椂闂�
+ </summary>
+ </member>
+ <member name="P:FlexJobApi.Core.GetCheckReceiveTasksQueryResultItem.EndTime">
+ <summary>
+ 浠诲姟缁撴潫鏃堕棿
+ </summary>
+ </member>
+ <member name="P:FlexJobApi.Core.GetCheckReceiveTasksQueryResultItem.AddressName">
+ <summary>
+ 浠诲姟鍦扮偣鍚嶇О
+ </summary>
+ </member>
+ <member name="P:FlexJobApi.Core.GetCheckReceiveTasksQueryResultItem.CheckReceiveStatus">
+ <summary>
+ 楠屾敹鐘舵��
+ </summary>
+ </member>
+ <member name="P:FlexJobApi.Core.GetCheckReceiveTasksQueryResultItem.LastCheckReceiveTime">
+ <summary>
+ 鏈�杩戦獙鏀舵椂闂�
</summary>
</member>
<member name="T:FlexJobApi.Core.GetCheckReceiveTaskUserSubmitsQuery">
@@ -3886,7 +3977,7 @@
</member>
<member name="P:FlexJobApi.Core.GetCheckReceiveTaskUserSubmitsQuery.Id">
<summary>
- 浠诲姟Id
+ 浠诲姟浜哄憳Id
</summary>
</member>
<member name="T:FlexJobApi.Core.GetCheckReceiveTaskUserSubmitsQueryResult">
@@ -3896,7 +3987,32 @@
</member>
<member name="T:FlexJobApi.Core.GetCheckReceiveTaskUserSubmitsQueryResultItem">
<summary>
- 鏌ヨ楠屾敹璇︽儏-缁撴灉
+ 鏌ヨ楠屾敹璇︽儏-缁撴灉-椤�
+ </summary>
+ </member>
+ <member name="P:FlexJobApi.Core.GetCheckReceiveTaskUserSubmitsQueryResultItem.Id">
+ <summary>
+ 鎻愪氦Id
+ </summary>
+ </member>
+ <member name="P:FlexJobApi.Core.GetCheckReceiveTaskUserSubmitsQueryResultItem.CreatedTime">
+ <summary>
+ 鎻愪氦鏃堕棿
+ </summary>
+ </member>
+ <member name="P:FlexJobApi.Core.GetCheckReceiveTaskUserSubmitsQueryResultItem.Files">
+ <summary>
+ 楠屾敹鐓х墖
+ </summary>
+ </member>
+ <member name="P:FlexJobApi.Core.GetCheckReceiveTaskUserSubmitsQueryResultItem.CheckReceiveStatus">
+ <summary>
+ 楠屾敹鐘舵��
+ </summary>
+ </member>
+ <member name="P:FlexJobApi.Core.GetCheckReceiveTaskUserSubmitsQueryResultItem.CheckReceiveTime">
+ <summary>
+ 楠屾敹鏃堕棿
</summary>
</member>
<member name="T:FlexJobApi.Core.DeleteTaskInfoCommand">
@@ -4934,6 +5050,11 @@
浠诲姟浜哄憳Id
</summary>
</member>
+ <member name="P:FlexJobApi.Core.GetTaskUsersQueryResultItem.EnterpriseEmployeeId">
+ <summary>
+ 鐏靛伐Id
+ </summary>
+ </member>
<member name="P:FlexJobApi.Core.GetTaskUsersQueryResultItem.Avatar">
<summary>
澶村儚
@@ -5276,6 +5397,11 @@
瀹炲悕鏃堕棿
</summary>
</member>
+ <member name="P:FlexJobApi.Core.GetEnterpriseEmployeeQueryResult.UserSignContractTime">
+ <summary>
+ 绛剧害鏃堕棿
+ </summary>
+ </member>
<member name="P:FlexJobApi.Core.GetEnterpriseEmployeeQueryResult.EnterpriseSignContractTime">
<summary>
浼佷笟绛剧害鏃堕棿
@@ -5351,6 +5477,11 @@
鐏靛伐Id
</summary>
</member>
+ <member name="P:FlexJobApi.Core.GetEnterpriseEmployeesQueryResultItem.Avatar">
+ <summary>
+ 澶村儚
+ </summary>
+ </member>
<member name="P:FlexJobApi.Core.GetEnterpriseEmployeesQueryResultItem.Name">
<summary>
濮撳悕
diff --git a/FlexJobApi.Core/Models/FlexJobServer/TaskCheckReceive/Queries/GetCheckReceiveTaskQuery.cs b/FlexJobApi.Core/Models/FlexJobServer/TaskCheckReceive/Queries/GetCheckReceiveTaskQuery.cs
index d2295ff..edd67f2 100644
--- a/FlexJobApi.Core/Models/FlexJobServer/TaskCheckReceive/Queries/GetCheckReceiveTaskQuery.cs
+++ b/FlexJobApi.Core/Models/FlexJobServer/TaskCheckReceive/Queries/GetCheckReceiveTaskQuery.cs
@@ -8,49 +8,58 @@
namespace FlexJobApi.Core
{
/// <summary>
- /// 鏌ヨ楠屾敹浠诲姟鍒嗛〉鍒楄〃
+ /// 鏌ヨ楠屾敹浠诲姟璇︽儏
/// </summary>
[Resource([EnumResourceController.TaskCheckReceive])]
public class GetCheckReceiveTaskQuery : PagedListQuery<GetCheckReceiveTaskQueryResult, GetCheckReceiveTaskQueryResultItem>
{
/// <summary>
- /// 楠屾敹鏃ユ湡-鏈�鏃╂椂闂�
+ /// 浠诲姟Id
/// </summary>
- public DateTime? DateBegin { get; set; }
-
- /// <summary>
- /// 楠屾敹鏃ユ湡-鏈�鏅氭椂闂�
- /// </summary>
- public DateTime? DateEnd { get; set; }
-
- /// <summary>
- /// 楠屾敹鐘舵��
- /// </summary>
- public EnumTaskCheckReceiveStatus? CheckReceiveStatus { get; set; }
+ public Guid TaskInfoId { get; set; }
}
/// <summary>
- /// 鏌ヨ楠屾敹浠诲姟鍒嗛〉鍒楄〃-缁撴灉
+ /// 鏌ヨ楠屾敹浠诲姟璇︽儏-缁撴灉
/// </summary>
public class GetCheckReceiveTaskQueryResult : PagedListQueryResult<GetCheckReceiveTaskQueryResultItem>
{
-
+ /// <summary>
+ /// 璇︽儏
+ /// </summary>
+ public GetCheckReceiveTaskQueryResultObjectData ObjectData { get; set; }
}
/// <summary>
- /// 鏌ヨ楠屾敹浠诲姟鍒嗛〉鍒楄〃-缁撴灉-椤�
+ ///
+ /// 鏌ヨ楠屾敹浠诲姟璇︽儏-缁撴灉-璇︽儏
/// </summary>
- public class GetCheckReceiveTaskQueryResultItem
+ public class GetCheckReceiveTaskQueryResultObjectData
{
- /// <summary>
- /// 浠诲姟Id
- /// </summary>
- public Guid Id { get; set; }
-
/// <summary>
/// 浠诲姟鍚嶇О
/// </summary>
public string Name { get; set; }
+
+ /// <summary>
+ /// 浠诲姟鍗曞彿
+ /// </summary>
+ public string Code { get; set; }
+
+ /// <summary>
+ /// 缁撶畻鍛ㄦ湡
+ /// </summary>
+ public EnumBillingMethod BillingMethod { get; set; }
+
+ /// <summary>
+ /// 鏈嶅姟璐�
+ /// </summary>
+ public decimal ServiceFee { get; set; }
+
+ /// <summary>
+ /// 缁撶畻鏂瑰紡
+ /// </summary>
+ public EnumSettlementCycle SettlementCycle { get; set; }
/// <summary>
/// 浠诲姟寮�濮嬫椂闂�
@@ -67,4 +76,76 @@
/// </summary>
public string AddressName { get; set; }
}
+
+ /// <summary>
+ /// 鏌ヨ楠屾敹浠诲姟璇︽儏-缁撴灉-椤�
+ /// </summary>
+ public class GetCheckReceiveTaskQueryResultItem
+ {
+ /// <summary>
+ /// 浠诲姟浜哄憳Id
+ /// </summary>
+ public Guid Id { get; set; }
+
+ /// <summary>
+ /// 浠诲姟鍚嶇О
+ /// </summary>
+ public string TaskInfoName { get; set; }
+
+ /// <summary>
+ /// 浠诲姟鍗曞彿
+ /// </summary>
+ public string TaskInfoCode { get; set; }
+
+ /// <summary>
+ /// 澶村儚
+ /// </summary>
+ public string Avatar { get; set; }
+
+ /// <summary>
+ /// 濮撳悕
+ /// </summary>
+ public string Name { get; set; }
+
+ /// <summary>
+ /// 韬唤璇佸彿
+ /// </summary>
+ public string Identity { get; set; }
+
+ /// <summary>
+ /// 鎬у埆
+ /// </summary>
+ public EnumUserGender? Gender { get; set; }
+
+ /// <summary>
+ /// 骞撮緞
+ /// </summary>
+ public int? Age { get; set; }
+
+ /// <summary>
+ /// 鎵嬫満鍙�
+ /// </summary>
+ /// <remarks>鑱旂郴鐢佃瘽</remarks>
+ public string ContactPhoneNumber { get; set; }
+
+ /// <summary>
+ /// 鏄惁瀹炲悕
+ /// </summary>
+ public bool IsReal { get; set; }
+
+ /// <summary>
+ /// 瀹炲悕鏂瑰紡
+ /// </summary>
+ public EnumUserRealMethod? RealMethod { get; set; }
+
+ /// <summary>
+ /// 鏈�杩戞彁浜ゆ椂闂�
+ /// </summary>
+ public DateTime? LastSubmitTime { get; set; }
+
+ /// <summary>
+ /// 楠屾敹鐘舵��
+ /// </summary>
+ public EnumTaskCheckReceiveStatus? CheckReceiveStatus { get; set; }
+ }
}
diff --git a/FlexJobApi.Core/Models/FlexJobServer/TaskCheckReceive/Queries/GetCheckReceiveTaskUserQuery.cs b/FlexJobApi.Core/Models/FlexJobServer/TaskCheckReceive/Queries/GetCheckReceiveTaskUserQuery.cs
deleted file mode 100644
index da99b43..0000000
--- a/FlexJobApi.Core/Models/FlexJobServer/TaskCheckReceive/Queries/GetCheckReceiveTaskUserQuery.cs
+++ /dev/null
@@ -1,116 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FlexJobApi.Core
-{
- /// <summary>
- /// 鏌ヨ楠屾敹鍒嗛〉鍒楄〃
- /// </summary>
- [Resource([EnumResourceController.TaskCheckReceive])]
- public class GetCheckReceiveTaskUserQuery : PagedListQuery<GetCheckReceiveTaskUserQueryResult, GetCheckReceiveTaskUserQueryResultItem>
- {
- /// <summary>
- /// 浠诲姟Id
- /// </summary>
- public Guid? TaskInfoId { get; set; }
-
- /// <summary>
- /// 鍏抽敭瀛�
- /// </summary>
- public string Keywords { get; set; }
-
- /// <summary>
- /// 楠屾敹鏃ユ湡-鏈�鏃╂椂闂�
- /// </summary>
- public DateTime? DateBegin { get; set; }
-
- /// <summary>
- /// 楠屾敹鏃ユ湡-鏈�鏅氭椂闂�
- /// </summary>
- public DateTime? DateEnd { get; set; }
-
- /// <summary>
- /// 楠屾敹鐘舵��
- /// </summary>
- public EnumTaskCheckReceiveStatus? CheckReceiveStatus { get; set; }
- }
-
- /// <summary>
- /// 鏌ヨ楠屾敹浠诲姟鍒嗛〉鍒楄〃-缁撴灉
- /// </summary>
- public class GetCheckReceiveTaskUserQueryResult : PagedListQueryResult<GetCheckReceiveTaskUserQueryResultItem>
- {
-
- }
-
- /// <summary>
- /// 鏌ヨ楠屾敹浠诲姟鍒嗛〉鍒楄〃-缁撴灉-椤�
- /// </summary>
- public class GetCheckReceiveTaskUserQueryResultItem
- {
- /// <summary>
- /// 浠诲姟Id
- /// </summary>
- public Guid Id { get; set; }
-
- /// <summary>
- /// 浠诲姟鍚嶇О
- /// </summary>
- public string TaskName { get; set; }
-
- /// <summary>
- /// 浠诲姟寮�濮嬫椂闂�
- /// </summary>
- public DateTime BeginTime { get; set; }
-
- /// <summary>
- /// 浠诲姟缁撴潫鏃堕棿
- /// </summary>
- public DateTime EndTime { get; set; }
-
- /// <summary>
- /// 浠诲姟鍦扮偣鍚嶇О
- /// </summary>
- public string AddressName { get; set; }
-
- /// <summary>
- /// 濮撳悕
- /// </summary>
- public string Name { get; set; }
-
- /// <summary>
- /// 韬唤璇佸彿
- /// </summary>
- public string Identity { get; set; }
-
- /// <summary>
- /// 鎬у埆
- /// </summary>
- public EnumUserGender? Gender { get; set; }
-
- /// <summary>
- /// 骞撮緞
- /// </summary>
- public int? Age { get; set; }
-
- /// <summary>
- /// 鎵嬫満鍙�
- /// </summary>
- /// <remarks>鑱旂郴鐢佃瘽</remarks>
- public string ContactPhoneNumber { get; set; }
-
- /// <summary>
- /// 鎻愪氦鏃堕棿
- /// </summary>
- public DateTime? LastSubmitTime { get; set; }
-
- /// <summary>
- /// 楠屾敹鐘舵��
- /// </summary>
- public EnumTaskCheckReceiveStatus? CheckReceiveStatus { get; set; }
- }
-}
diff --git a/FlexJobApi.Core/Models/FlexJobServer/TaskCheckReceive/Queries/GetCheckReceiveTaskUserSubmitsQuery.cs b/FlexJobApi.Core/Models/FlexJobServer/TaskCheckReceive/Queries/GetCheckReceiveTaskUserSubmitsQuery.cs
index f817fed..dfdd381 100644
--- a/FlexJobApi.Core/Models/FlexJobServer/TaskCheckReceive/Queries/GetCheckReceiveTaskUserSubmitsQuery.cs
+++ b/FlexJobApi.Core/Models/FlexJobServer/TaskCheckReceive/Queries/GetCheckReceiveTaskUserSubmitsQuery.cs
@@ -1,6 +1,7 @@
锘縰sing MediatR;
using System;
using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
@@ -14,7 +15,7 @@
public class GetCheckReceiveTaskUserSubmitsQuery : PagedListQuery<GetCheckReceiveTaskUserSubmitsQueryResult, GetCheckReceiveTaskUserSubmitsQueryResultItem>
{
/// <summary>
- /// 浠诲姟Id
+ /// 浠诲姟浜哄憳Id
/// </summary>
public Guid Id { get; set; }
}
@@ -28,10 +29,38 @@
}
/// <summary>
- /// 鏌ヨ楠屾敹璇︽儏-缁撴灉
+ /// 鏌ヨ楠屾敹璇︽儏-缁撴灉-椤�
/// </summary>
public class GetCheckReceiveTaskUserSubmitsQueryResultItem
{
+ public GetCheckReceiveTaskUserSubmitsQueryResultItem()
+ {
+ Files = [];
+ }
+ /// <summary>
+ /// 鎻愪氦Id
+ /// </summary>
+ public Guid Id { get; set; }
+
+ /// <summary>
+ /// 鎻愪氦鏃堕棿
+ /// </summary>
+ public DateTimeOffset CreatedTime { get; set; }
+
+ /// <summary>
+ /// 楠屾敹鐓х墖
+ /// </summary>
+ public List<string> Files { get; set; }
+
+ /// <summary>
+ /// 楠屾敹鐘舵��
+ /// </summary>
+ public EnumTaskUserSubmitCheckReceiveStatus CheckReceiveStatus { get; set; }
+
+ /// <summary>
+ /// 楠屾敹鏃堕棿
+ /// </summary>
+ public DateTime? CheckReceiveTime { get; set; }
}
}
diff --git a/FlexJobApi.Core/Models/FlexJobServer/TaskCheckReceive/Queries/GetCheckReceiveTasksQuery.cs b/FlexJobApi.Core/Models/FlexJobServer/TaskCheckReceive/Queries/GetCheckReceiveTasksQuery.cs
new file mode 100644
index 0000000..fb7d1de
--- /dev/null
+++ b/FlexJobApi.Core/Models/FlexJobServer/TaskCheckReceive/Queries/GetCheckReceiveTasksQuery.cs
@@ -0,0 +1,106 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FlexJobApi.Core
+{
+ /// <summary>
+ /// 鏌ヨ楠屾敹浠诲姟鍒嗛〉鍒楄〃
+ /// </summary>
+ [Resource([EnumResourceController.TaskCheckReceive])]
+ public class GetCheckReceiveTasksQuery : PagedListQuery<GetCheckReceiveTasksQueryResult, GetCheckReceiveTasksQueryResultItem>
+ {
+ /// <summary>
+ /// 鏃ユ湡锛堝皬绋嬪簭-楠屾敹绠＄悊涓撶敤锛�
+ /// </summary>
+ public DateTime? Date { get; set; }
+
+ /// <summary>
+ /// 楠屾敹鏃ユ湡-鏈�鏃╂椂闂达紙B绔鎴风-楠屾敹绠＄悊涓撶敤锛�
+ /// </summary>
+ public DateTime? CheckReceiveTimeBegin { get; set; }
+
+ /// <summary>
+ /// 楠屾敹鏃ユ湡-鏈�鏅氭椂闂达紙B绔鎴风-楠屾敹绠＄悊涓撶敤锛�
+ /// </summary>
+ public DateTime? CheckReceiveTimeEnd { get; set; }
+
+ /// <summary>
+ /// 楠屾敹鐘舵��
+ /// </summary>
+ public EnumTaskCheckReceiveStatus? CheckReceiveStatus { get; set; }
+ }
+
+ /// <summary>
+ /// 鏌ヨ楠屾敹浠诲姟鍒嗛〉鍒楄〃-缁撴灉
+ /// </summary>
+ public class GetCheckReceiveTasksQueryResult : PagedListQueryResult<GetCheckReceiveTasksQueryResultItem>
+ {
+
+ }
+
+ /// <summary>
+ /// 鏌ヨ楠屾敹浠诲姟鍒嗛〉鍒楄〃-缁撴灉-椤�
+ /// </summary>
+ public class GetCheckReceiveTasksQueryResultItem
+ {
+ /// <summary>
+ /// 浠诲姟Id
+ /// </summary>
+ public Guid Id { get; set; }
+
+ /// <summary>
+ /// 浠诲姟鍚嶇О
+ /// </summary>
+ public string Name { get; set; }
+
+ /// <summary>
+ /// 浠诲姟鍗曞彿
+ /// </summary>
+ public string Code { get; set; }
+
+ /// <summary>
+ /// 缁撶畻鍛ㄦ湡
+ /// </summary>
+ public EnumBillingMethod BillingMethod { get; set; }
+
+ /// <summary>
+ /// 鏈嶅姟璐�
+ /// </summary>
+ public decimal ServiceFee { get; set; }
+
+ /// <summary>
+ /// 缁撶畻鏂瑰紡
+ /// </summary>
+ public EnumSettlementCycle SettlementCycle { get; set; }
+
+ /// <summary>
+ /// 浠诲姟寮�濮嬫椂闂�
+ /// </summary>
+ public DateTime BeginTime { get; set; }
+
+ /// <summary>
+ /// 浠诲姟缁撴潫鏃堕棿
+ /// </summary>
+ public DateTime EndTime { get; set; }
+
+ /// <summary>
+ /// 浠诲姟鍦扮偣鍚嶇О
+ /// </summary>
+ public string AddressName { get; set; }
+
+ /// <summary>
+ /// 楠屾敹鐘舵��
+ /// </summary>
+ public EnumTaskCheckReceiveStatus? CheckReceiveStatus { get; set; }
+
+ /// <summary>
+ /// 鏈�杩戦獙鏀舵椂闂�
+ /// </summary>
+ public DateTime? LastCheckReceiveTime { get; set; }
+
+ }
+}
diff --git a/FlexJobApi.FlexJobServer.Application/FlexJobApi.FlexJobServer.Application.xml b/FlexJobApi.FlexJobServer.Application/FlexJobApi.FlexJobServer.Application.xml
index 6e657d7..4a95c6e 100644
--- a/FlexJobApi.FlexJobServer.Application/FlexJobApi.FlexJobServer.Application.xml
+++ b/FlexJobApi.FlexJobServer.Application/FlexJobApi.FlexJobServer.Application.xml
@@ -14,7 +14,7 @@
浠诲姟浜哄憳鏌ヨ澶勭悊鍣�
</summary>
</member>
- <member name="M:FlexJobApi.FlexJobServer.Application.TaskUserSubmitQueryHandler.Handle(FlexJobApi.Core.GetCheckReceiveTaskQuery,System.Threading.CancellationToken)">
+ <member name="M:FlexJobApi.FlexJobServer.Application.TaskUserSubmitQueryHandler.Handle(FlexJobApi.Core.GetCheckReceiveTasksQuery,System.Threading.CancellationToken)">
<summary>
鏌ヨ楠屾敹浠诲姟鍒嗛〉鍒楄〃
</summary>
@@ -22,9 +22,9 @@
<param name="cancellationToken"></param>
<returns></returns>
</member>
- <member name="M:FlexJobApi.FlexJobServer.Application.TaskUserSubmitQueryHandler.Handle(FlexJobApi.Core.GetCheckReceiveTaskUserQuery,System.Threading.CancellationToken)">
+ <member name="M:FlexJobApi.FlexJobServer.Application.TaskUserSubmitQueryHandler.Handle(FlexJobApi.Core.GetCheckReceiveTaskQuery,System.Threading.CancellationToken)">
<summary>
- 鏌ヨ楠屾敹鍒嗛〉鍒楄〃
+ 鏌ヨ楠屾敹浠诲姟璇︽儏
</summary>
<param name="request"></param>
<param name="cancellationToken"></param>
diff --git a/FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskUserSubmitQueryHandler.cs b/FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskUserSubmitQueryHandler.cs
index 81323ed..b5060d0 100644
--- a/FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskUserSubmitQueryHandler.cs
+++ b/FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskUserSubmitQueryHandler.cs
@@ -18,8 +18,8 @@
public class TaskUserSubmitQueryHandler(
IRepository<TaskInfo> repTaskInfo,
IRepository<TaskInfoUser> repTaskInfoUser) :
- IRequestHandler<GetCheckReceiveTaskQuery, GetCheckReceiveTaskQueryResult>,
- IRequestHandler<GetCheckReceiveTaskUserQuery, GetCheckReceiveTaskUserQueryResult>
+ IRequestHandler<GetCheckReceiveTasksQuery, GetCheckReceiveTasksQueryResult>,
+ IRequestHandler<GetCheckReceiveTaskQuery, GetCheckReceiveTaskQueryResult>
{
private readonly IRepository<TaskInfo> repTaskInfo = repTaskInfo;
private readonly IRepository<TaskInfoUser> repTaskInfoUser = repTaskInfoUser;
@@ -30,7 +30,7 @@
/// <param name="request"></param>
/// <param name="cancellationToken"></param>
/// <returns></returns>
- public async Task<GetCheckReceiveTaskQueryResult> Handle(GetCheckReceiveTaskQuery request, CancellationToken cancellationToken)
+ public async Task<GetCheckReceiveTasksQueryResult> Handle(GetCheckReceiveTasksQuery request, CancellationToken cancellationToken)
{
var logier = JwtUtils.GetCurrentLogier();
var q = repTaskInfo.AsQueryable().AsNoTracking()
@@ -51,15 +51,15 @@
{
throw Oops.Oh(EnumErrorCodeType.s400, "璇烽�夋嫨楠屾敹鐘舵��");
}
- if (request.DateBegin == null || request.DateEnd == null)
+ if (request.Date == null)
{
throw Oops.Oh(EnumErrorCodeType.s400, "璇烽�夋嫨鏃ユ湡");
}
q = q.Where(it =>
it.TaskInfoUsers.Any(tu =>
- tu.Submits.Any(s =>
- request.DateBegin.Value.Date <= s.Date.Date
- && s.Date.Date <= request.DateEnd.Value.Date
+ tu.EnterpriseEmployee.UserId == logier.Id
+ && tu.Submits.Any(s =>
+ s.Date.Date == request.Date.Value.Date
&& (request.CheckReceiveStatus == EnumTaskCheckReceiveStatus.WaitSubmit
? s.CheckReceiveStatus == EnumTaskUserSubmitCheckReceiveStatus.WaitSubmit
: request.CheckReceiveStatus == EnumTaskCheckReceiveStatus.WaitCheckReceive
@@ -69,35 +69,31 @@
}
else
{
- if (request.DateBegin.HasValue && request.DateEnd.HasValue)
+ if (request.CheckReceiveTimeBegin.HasValue && request.CheckReceiveTimeEnd.HasValue)
{
- q = q.Where(it =>
- it.TaskInfoUsers.Any(tu =>
- tu.Submits.Any(s =>
- request.DateBegin.Value.Date <= s.Date.Date
- && s.Date.Date <= request.DateEnd.Value.Date)));
+ q = q.Where(it => request.CheckReceiveTimeBegin <= it.LastCheckReceiveTime && it.LastCheckReceiveTime <= request.CheckReceiveTimeEnd);
}
if (request.CheckReceiveStatus.HasValue)
{
q = q.Where(it => it.CheckReceiveStatus == request.CheckReceiveStatus);
}
}
- var s = q.ProjectToType<GetCheckReceiveTaskQueryResultItem>();
- return await request.PageModel.GetPagedListAsync<GetCheckReceiveTaskQueryResult, GetCheckReceiveTaskQueryResultItem>(s, cancellationToken);
+ var s = q.ProjectToType<GetCheckReceiveTasksQueryResultItem>();
+ return await request.PageModel.GetPagedListAsync<GetCheckReceiveTasksQueryResult, GetCheckReceiveTasksQueryResultItem>(s, cancellationToken);
}
/// <summary>
- /// 鏌ヨ楠屾敹鍒嗛〉鍒楄〃
+ /// 鏌ヨ楠屾敹浠诲姟璇︽儏
/// </summary>
/// <param name="request"></param>
/// <param name="cancellationToken"></param>
/// <returns></returns>
- public async Task<GetCheckReceiveTaskUserQueryResult> Handle(GetCheckReceiveTaskUserQuery request, CancellationToken cancellationToken)
+ public async Task<GetCheckReceiveTaskQueryResult> Handle(GetCheckReceiveTaskQuery request, CancellationToken cancellationToken)
{
var logier = JwtUtils.GetCurrentLogier();
var q = repTaskInfoUser.AsQueryable().AsNoTracking()
.OrderBy(it => it.CreatedTime)
- .AsQueryable();
+ .Where(it => it.TaskInfoId == request.TaskInfoId);
if (logier.Type == EnumUserType.Personal)
{
@@ -107,78 +103,24 @@
{
q = q.Where(it => it.TaskInfo.EnterpriseId == logier.EnterpriseId);
}
- if (request.TaskInfoId.HasValue)
- {
- q = q.Where(it => it.TaskInfoId == request.TaskInfoId);
- }
- if (request.Keywords.IsNotNull())
- {
- q = q.Where(it =>
- it.EnterpriseEmployee.User.Name.Contains(request.Keywords)
- || it.EnterpriseEmployee.User.ContactPhoneNumber.Contains(request.Keywords)
- || it.EnterpriseEmployee.User.Identity.Contains(request.Keywords));
- }
- if (logier.ClientType == EnumClientType.Wxmp)
- {
- if (request.CheckReceiveStatus == null)
- {
- throw Oops.Oh(EnumErrorCodeType.s400, "璇烽�夋嫨楠屾敹鐘舵��");
- }
- if (request.DateBegin == null || request.DateEnd == null)
- {
- throw Oops.Oh(EnumErrorCodeType.s400, "璇烽�夋嫨鏃ユ湡");
- }
- q = q.Where(it => it.Submits.Any(s =>
- request.DateBegin.Value.Date <= s.Date.Date
- && s.Date.Date <= request.DateEnd.Value.Date
- && (request.CheckReceiveStatus == EnumTaskCheckReceiveStatus.WaitSubmit
- ? s.CheckReceiveStatus == EnumTaskUserSubmitCheckReceiveStatus.WaitSubmit
- : request.CheckReceiveStatus == EnumTaskCheckReceiveStatus.WaitCheckReceive
- ? s.CheckReceiveStatus == EnumTaskUserSubmitCheckReceiveStatus.WaitCheckReceive
- : (s.CheckReceiveStatus == EnumTaskUserSubmitCheckReceiveStatus.Success
- || s.CheckReceiveStatus == EnumTaskUserSubmitCheckReceiveStatus.Fail))));
- }
- else
- {
- if (request.DateBegin.HasValue && request.DateEnd.HasValue)
- {
- q = q.Where(it => it.Submits.Any(s =>
- request.DateBegin.Value.Date <= s.Date.Date
- && s.Date.Date <= request.DateEnd.Value.Date));
- }
- if (request.CheckReceiveStatus.HasValue)
- {
- q = q.Where(it => it.CheckReceiveStatus == request.CheckReceiveStatus);
- }
- }
- var s = q.Select(it => new GetCheckReceiveTaskUserQueryResultItem
+ var s = q.Select(it => new GetCheckReceiveTaskQueryResultItem
{
Id = it.TaskInfoId,
- TaskName = it.TaskInfo.Name,
- BeginTime = it.TaskInfo.BeginTime,
- EndTime = it.TaskInfo.EndTime,
- AddressName = it.TaskInfo.AddressName,
+ TaskInfoCode = it.TaskInfo.Code,
+ TaskInfoName = it.TaskInfo.Name,
+ Avatar = it.EnterpriseEmployee.User.Avatar,
Name = it.EnterpriseEmployee.User.Name,
Identity = it.EnterpriseEmployee.User.Identity,
Age = it.EnterpriseEmployee.User.Age,
Gender = it.EnterpriseEmployee.User.Gender,
ContactPhoneNumber = it.EnterpriseEmployee.User.ContactPhoneNumber,
- CheckReceiveStatus = logier.ClientType == EnumClientType.Wxmp && request.DateBegin.HasValue && request.DateEnd.HasValue
- ? it.Submits
- .Where(s =>
- request.DateBegin.Value.Date <= s.Date.Date
- && s.Date.Date <= request.DateEnd.Value.Date)
- .Select(s =>
- s.CheckReceiveStatus == EnumTaskUserSubmitCheckReceiveStatus.WaitSubmit
- ? EnumTaskCheckReceiveStatus.WaitSubmit
- : s.CheckReceiveStatus == EnumTaskUserSubmitCheckReceiveStatus.WaitCheckReceive
- ? EnumTaskCheckReceiveStatus.WaitCheckReceive
- : EnumTaskCheckReceiveStatus.Completed)
- .FirstOrDefault()
- : it.CheckReceiveStatus,
+ IsReal = it.EnterpriseEmployee.User.IsReal,
+ RealMethod = it.EnterpriseEmployee.User.RealMethod,
+ CheckReceiveStatus = it.CheckReceiveStatus,
LastSubmitTime = it.LastSubmitTime,
});
- return await request.PageModel.GetPagedListAsync<GetCheckReceiveTaskUserQueryResult, GetCheckReceiveTaskUserQueryResultItem>(s, cancellationToken);
+ var result = await request.PageModel.GetPagedListAsync<GetCheckReceiveTaskQueryResult, GetCheckReceiveTaskQueryResultItem>(s, cancellationToken);
+ return result;
}
}
}
diff --git a/FlexJobApi.FlexJobServer.Application/TaskUsers/Queries/TaskUserQueryHandler.cs b/FlexJobApi.FlexJobServer.Application/TaskUsers/Queries/TaskUserQueryHandler.cs
index 5da9734..5846816 100644
--- a/FlexJobApi.FlexJobServer.Application/TaskUsers/Queries/TaskUserQueryHandler.cs
+++ b/FlexJobApi.FlexJobServer.Application/TaskUsers/Queries/TaskUserQueryHandler.cs
@@ -48,6 +48,7 @@
.Select(it => new GetTaskUsersQueryResultItem
{
Id = it.Id,
+ EnterpriseEmployeeId = it.EnterpriseEmployeeId,
Avatar = it.EnterpriseEmployee.User.Avatar,
Name = it.EnterpriseEmployee.User.Name,
Identity = it.EnterpriseEmployee.User.Identity,
--
Gitblit v1.9.1