From 1d2953530fc3019ffc2bbe71f4de2ab7820fe528 Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期一, 11 八月 2025 17:26:31 +0800
Subject: [PATCH] feat:开发
---
FlexJobApi.FlexJobServer.Application/Tasks/Queries/TaskInfoQueryHandler.cs | 28 +++++++++++++++++++++-------
1 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/FlexJobApi.FlexJobServer.Application/Tasks/Queries/TaskInfoQueryHandler.cs b/FlexJobApi.FlexJobServer.Application/Tasks/Queries/TaskInfoQueryHandler.cs
index de719a8..016884a 100644
--- a/FlexJobApi.FlexJobServer.Application/Tasks/Queries/TaskInfoQueryHandler.cs
+++ b/FlexJobApi.FlexJobServer.Application/Tasks/Queries/TaskInfoQueryHandler.cs
@@ -39,7 +39,7 @@
.ProjectToType<GetTaskInfoQueryResult>()
.FirstOrDefaultAsync(cancellationToken);
model.TaskCount = await rep.AsQueryable().AsNoTracking()
- .Where(it => it.EnterpriseId == model.EnterpriseId && it.ReleaseStatus == EnumTaskReleaseStatus.Stopped)
+ .Where(it => it.EnterpriseId == model.EnterpriseId && it.ReleaseStatus == EnumTaskReleaseStatus.InProcess)
.CountAsync();
return model;
}
@@ -52,7 +52,8 @@
/// <returns></returns>
public async Task<GetTaskInfosQueryResult> Handle(GetTaskInfosQuery request, CancellationToken cancellationToken)
{
- var q = TaskInfoRepository.GetQueryable(rep);
+ var logier = JwtUtils.GetCurrentLogier();
+ var q = TaskInfoRepository.GetQueryable(rep, true, logier);
if (request.Keywords.IsNotNull())
{
q = q.Where(it => it.Name.Contains(request.Keywords));
@@ -81,10 +82,14 @@
{
q = q.Where(it => it.GenderLimit == request.GenderLimit);
}
-
- var count = new GetTaskInfosQueryResultCount
+ if (request.HireStatus.IsNotNull() && logier.Type == EnumUserType.Personal)
{
- WaitAssignCount = await q.CountAsync(it => it.Status == EnumTaskStatus.Wait),
+ q = q.Where(it => it.TaskInfoUsers.Any(u => u.UserId == logier.Id && request.HireStatus.Contains(u.HireStatus)));
+ }
+
+ var count = new GetTaskInfosQueryResultObjectData
+ {
+ WaitAssignCount = await q.CountAsync(it => it.ReleaseStatus == EnumTaskReleaseStatus.InProcess && it.Status == EnumTaskStatus.Wait),
CompletedAssignCount = await q.CountAsync(it => it.Status == EnumTaskStatus.Complete),
InProcessReleaseCount = await q.CountAsync(it => it.ReleaseStatus == EnumTaskReleaseStatus.InProcess),
StoppedReleaseCount = await q.CountAsync(it => it.ReleaseStatus == EnumTaskReleaseStatus.Stopped),
@@ -101,6 +106,10 @@
if (request.RecommendStatus.HasValue)
{
q = q.Where(it => it.RecommendStatus == request.RecommendStatus);
+ }
+ if (request.CheckReceiveStatus.HasValue)
+ {
+ q = q.Where(it => it.CheckReceiveStatus == request.CheckReceiveStatus);
}
var s = from t in q
select new GetTaskInfosQueryResultItem
@@ -130,7 +139,7 @@
AddressDetail = t.AddressDetail,
Latitude = t.Latitude,
Longitude = t.Longitude,
- UserCount = t.Users.Count(),
+ UserCount = t.TaskInfoUsers.Count(tu => tu.SignContractStatus == EnumTaskUserSignContractStatus.Pass),
Status = t.Status,
BeginTime = t.BeginTime,
EndTime = t.EndTime,
@@ -138,9 +147,14 @@
CheckReceiveStatus = t.CheckReceiveStatus,
CreatedTime = t.CreatedTime,
RecommendStatus = t.RecommendStatus,
- SettlementStatus = t.SettlementStatus
+ SettlementStatus = t.SettlementStatus,
+ HireStatus = logier != null
+ ? t.TaskInfoUsers.Where(it => it.UserId == logier.Id).Select(u => u.HireStatus).FirstOrDefault()
+ : null
};
var result = await request.PageModel.GetPagedListAsync<GetTaskInfosQueryResult, GetTaskInfosQueryResultItem>(s, cancellationToken);
+ result.ObjectData = count;
+ return result;
}
}
}
--
Gitblit v1.9.1