From 809cd3966929f4c4f190ed8aa604d137227fe641 Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期三, 13 八月 2025 15:39:38 +0800
Subject: [PATCH] feat:开发
---
FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskCheckReceiveQueryHandler.cs | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskCheckReceiveQueryHandler.cs b/FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskCheckReceiveQueryHandler.cs
index 1517eef..8bb400a 100644
--- a/FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskCheckReceiveQueryHandler.cs
+++ b/FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskCheckReceiveQueryHandler.cs
@@ -68,10 +68,10 @@
s.Date.Date == request.Date.Value.Date
&& (request.CheckReceiveStatus == EnumTaskCheckReceiveStatus.WaitSubmit
? s.CheckReceiveStatus == EnumTaskUserSubmitCheckReceiveStatus.WaitSubmit
- : request.CheckReceiveStatus == EnumTaskCheckReceiveStatus.WaitCheckReceive
+ : (request.CheckReceiveStatus == EnumTaskCheckReceiveStatus.WaitCheckReceive
? s.CheckReceiveStatus == EnumTaskUserSubmitCheckReceiveStatus.WaitCheckReceive
: (s.CheckReceiveStatus == EnumTaskUserSubmitCheckReceiveStatus.Success
- || s.CheckReceiveStatus == EnumTaskUserSubmitCheckReceiveStatus.Fail))))));
+ || s.CheckReceiveStatus == EnumTaskUserSubmitCheckReceiveStatus.Fail)))))));
}
else
{
@@ -111,7 +111,7 @@
}
var s = q.Select(it => new GetCheckReceiveTaskQueryResultItem
{
- Id = it.TaskInfoId,
+ Id = it.Id,
TaskInfoCode = it.TaskInfo.Code,
TaskInfoName = it.TaskInfo.Name,
Avatar = it.EnterpriseEmployee.User.Avatar,
@@ -167,9 +167,20 @@
/// <returns></returns>
public Task<GetCheckReceiveTaskUserSubmitQueryResult> Handle(GetCheckReceiveTaskUserSubmitQuery request, CancellationToken cancellationToken)
{
- return repTaskInfoUserSubmit.AsQueryable().AsNoTracking()
- .Where(it => it.Id == request.Id)
- .GetDetail<TaskInfoUserSubmit, GetCheckReceiveTaskUserSubmitQueryResult>();
+ var q = repTaskInfoUserSubmit.AsQueryable().AsNoTracking();
+ if (request.SubmitId.HasValue)
+ {
+ q = q.Where(it => it.Id == request.SubmitId.Value);
+ }
+ else if (request.Date.HasValue && request.TaskInfoId.HasValue)
+ {
+ q = q.Where(it => it.Date.Date == request.Date.Value.Date && it.TaskInfoUser.TaskInfoId == request.TaskInfoId.Value);
+ }
+ else if (request.Date.HasValue && request.TaskInfoUserId.HasValue)
+ {
+ q = q.Where(it => it.Date.Date == request.Date.Value.Date && it.TaskInfoUserId == request.TaskInfoUserId.Value);
+ }
+ return q.GetDetail<TaskInfoUserSubmit, GetCheckReceiveTaskUserSubmitQueryResult>();
}
}
}
--
Gitblit v1.9.1