From 61aad62d817ddb6494f52a531fccb7e82bcfd13c Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期五, 08 八月 2025 17:39:27 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/ApiFlexJob
---
FlexJobApi.FlexJobServer.Application/Tasks/Queries/TaskInfoQueryHandler.cs | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/FlexJobApi.FlexJobServer.Application/Tasks/Queries/TaskInfoQueryHandler.cs b/FlexJobApi.FlexJobServer.Application/Tasks/Queries/TaskInfoQueryHandler.cs
index 0efc40e..0b5e59b 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;
}
@@ -82,9 +82,9 @@
q = q.Where(it => it.GenderLimit == request.GenderLimit);
}
- var count = new GetTaskInfosQueryResultCount
+ var count = new GetTaskInfosQueryResultObjectData
{
- WaitAssignCount = await q.CountAsync(it => it.Status == EnumTaskStatus.Wait),
+ 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),
@@ -141,6 +141,7 @@
SettlementStatus = t.SettlementStatus
};
var result = await request.PageModel.GetPagedListAsync<GetTaskInfosQueryResult, GetTaskInfosQueryResultItem>(s, cancellationToken);
+ result.ObjectData = count;
return result;
}
}
--
Gitblit v1.9.1