From 44cdf09012d27e12c3d113f9a3ffdc9ddc2853ad Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期五, 05 九月 2025 14:23:57 +0800
Subject: [PATCH] feat:开发
---
FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskCheckReceiveQueryHandler.cs | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskCheckReceiveQueryHandler.cs b/FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskCheckReceiveQueryHandler.cs
index d578e17..32fea4c 100644
--- a/FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskCheckReceiveQueryHandler.cs
+++ b/FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskCheckReceiveQueryHandler.cs
@@ -36,20 +36,21 @@
/// <returns></returns>
public async Task<GetCheckReceiveTasksQueryResult> Handle(GetCheckReceiveTasksQuery request, CancellationToken cancellationToken)
{
+ var now = DateTime.Now;
var logier = JwtUtils.GetCurrentLogier();
var q = repTaskInfo.AsQueryable().AsNoTracking()
.OrderBy(it => it.CreatedTime)
- .AsQueryable();
+ .Where(it => it.BeginTime <= now.Date && now.Date <= it.EndTime);
if (logier.Type == EnumUserType.Personal)
{
- q = q.Where(it => it.TaskInfoUsers.Any(tu =>
- tu.EnterpriseEmployee.UserId == logier.Id
+ q = q.Where(it => it.TaskInfoUsers.Any(tu =>
+ tu.EnterpriseEmployee.UserId == logier.Id
&& tu.ArrangeStatus == EnumTaskUserArrangeStatus.Complete));
}
else if (logier.Type == EnumUserType.Enterprise)
{
- q = q.Where(it =>
+ q = q.Where(it =>
it.EnterpriseId == logier.EnterpriseId
&& it.Status == EnumTaskStatus.Complete);
}
@@ -73,6 +74,7 @@
}
q = q.Where(it =>
(logier.Type == EnumUserType.Enterprise ? it.EnterpriseId == logier.EnterpriseId : true)
+ && it.BeginTime.Date <= request.Date.Value && request.Date.Value <= it.EndTime.Date
&& it.TaskInfoUsers.Any(tu =>
(logier.Type == EnumUserType.Personal ? tu.EnterpriseEmployee.UserId == logier.Id : true)
&& (request.CheckReceiveStatus == EnumTaskCheckReceiveStatus.WaitSubmit
@@ -218,6 +220,7 @@
var s = q.Select(it => new GetCheckReceiveTaskUserSubmitsQueryResultItem
{
Id = it.Id,
+ Date = it.Date,
CreatedTime = it.CreatedTime,
Files = it.Files.Select(f => f.File).ToList(),
CheckReceiveStatus = it.CheckReceiveStatus,
--
Gitblit v1.9.1