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.Core/FlexJobApi.Core.xml | 5 +++++
FlexJobApi.UserServer.Application/Enterprises/Queries/EnterprisesQueryHandler.cs | 6 +++++-
FlexJobApi.UserServer.Application/FlexJobApi.UserServer.Application.xml | 2 +-
FlexJobApi.FlexJobServer.Application/Tasks/Queries/TaskInfoQueryHandler.cs | 2 +-
FlexJobApi.Core/Models/UserServer/Enterprises/Queries/GetEnterpriseQuery.cs | 4 ++++
5 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/FlexJobApi.Core/FlexJobApi.Core.xml b/FlexJobApi.Core/FlexJobApi.Core.xml
index cd6874f..d715f69 100644
--- a/FlexJobApi.Core/FlexJobApi.Core.xml
+++ b/FlexJobApi.Core/FlexJobApi.Core.xml
@@ -3924,6 +3924,11 @@
璐﹀彿
</summary>
</member>
+ <member name="P:FlexJobApi.Core.GetEnterpriseQueryResult.TaskCount">
+ <summary>
+ 鍦ㄦ嫑宀椾綅鏁伴噺
+ </summary>
+ </member>
<member name="T:FlexJobApi.Core.GetEnterpriseSmsSettingQuery">
<summary>
鏌ヨ浼佷笟鐭俊閰嶇疆
diff --git a/FlexJobApi.Core/Models/UserServer/Enterprises/Queries/GetEnterpriseQuery.cs b/FlexJobApi.Core/Models/UserServer/Enterprises/Queries/GetEnterpriseQuery.cs
index b51ab9f..cbc1c36 100644
--- a/FlexJobApi.Core/Models/UserServer/Enterprises/Queries/GetEnterpriseQuery.cs
+++ b/FlexJobApi.Core/Models/UserServer/Enterprises/Queries/GetEnterpriseQuery.cs
@@ -105,5 +105,9 @@
/// 璐﹀彿
/// </summary>
public string UserName { get; set; }
+ /// <summary>
+ /// 鍦ㄦ嫑宀椾綅鏁伴噺
+ /// </summary>
+ public int TaskCount { get; set; }
}
}
diff --git a/FlexJobApi.FlexJobServer.Application/Tasks/Queries/TaskInfoQueryHandler.cs b/FlexJobApi.FlexJobServer.Application/Tasks/Queries/TaskInfoQueryHandler.cs
index 21b3abe..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;
}
diff --git a/FlexJobApi.UserServer.Application/Enterprises/Queries/EnterprisesQueryHandler.cs b/FlexJobApi.UserServer.Application/Enterprises/Queries/EnterprisesQueryHandler.cs
index b8a24bd..5265f9f 100644
--- a/FlexJobApi.UserServer.Application/Enterprises/Queries/EnterprisesQueryHandler.cs
+++ b/FlexJobApi.UserServer.Application/Enterprises/Queries/EnterprisesQueryHandler.cs
@@ -18,7 +18,8 @@
public class EnterprisesQueryHandler(
IRepository<Enterprise> rep,
IRepository<EnterpriseAuth> repEnterpriseAuth,
- IRepository<DictionaryData> repDictionaryData
+ IRepository<DictionaryData> repDictionaryData,
+ IRepository<TaskInfo> repTaskInfo
) :
IRequestHandler<GetEnterprisesQuery, PagedListQueryResult<GetEnterprisesQueryResultItem>>,
IRequestHandler<GetEnterpriseQuery, GetEnterpriseQueryResult>,
@@ -89,6 +90,9 @@
.Where(it => it.EnterpriseId == model.Id)
.Select(it => it.UserName)
.FirstOrDefaultAsync(cancellationToken);
+ model.TaskCount = await repTaskInfo.AsQueryable().AsNoTracking()
+ .Where(it => it.EnterpriseId == request.Id && it.ReleaseStatus == EnumTaskReleaseStatus.InProcess)
+ .CountAsync();
return model;
}
diff --git a/FlexJobApi.UserServer.Application/FlexJobApi.UserServer.Application.xml b/FlexJobApi.UserServer.Application/FlexJobApi.UserServer.Application.xml
index d61e627..92ae932 100644
--- a/FlexJobApi.UserServer.Application/FlexJobApi.UserServer.Application.xml
+++ b/FlexJobApi.UserServer.Application/FlexJobApi.UserServer.Application.xml
@@ -153,7 +153,7 @@
浼佷笟鏌ヨ澶勭悊鍣�
</summary>
</member>
- <member name="M:FlexJobApi.UserServer.Application.EnterprisesQueryHandler.#ctor(Furion.DatabaseAccessor.IRepository{FlexJobApi.Core.Enterprise},Furion.DatabaseAccessor.IRepository{FlexJobApi.Core.EnterpriseAuth},Furion.DatabaseAccessor.IRepository{FlexJobApi.Core.DictionaryData})">
+ <member name="M:FlexJobApi.UserServer.Application.EnterprisesQueryHandler.#ctor(Furion.DatabaseAccessor.IRepository{FlexJobApi.Core.Enterprise},Furion.DatabaseAccessor.IRepository{FlexJobApi.Core.EnterpriseAuth},Furion.DatabaseAccessor.IRepository{FlexJobApi.Core.DictionaryData},Furion.DatabaseAccessor.IRepository{FlexJobApi.Core.TaskInfo})">
<summary>
浼佷笟鏌ヨ澶勭悊鍣�
</summary>
--
Gitblit v1.9.1