From 8cc3bff6979c8e3d66e9d4caa91398c3f0e58f0a Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期五, 12 九月 2025 15:09:43 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/ApiFlexJob
---
FlexJobApi.UserServer.Application/ElectronSign/Queries/ContractTemplateQueryHandler.cs | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/FlexJobApi.UserServer.Application/ElectronSign/Queries/ContractTemplateQueryHandler.cs b/FlexJobApi.UserServer.Application/ElectronSign/Queries/ContractTemplateQueryHandler.cs
index d73462b..67d6b7f 100644
--- a/FlexJobApi.UserServer.Application/ElectronSign/Queries/ContractTemplateQueryHandler.cs
+++ b/FlexJobApi.UserServer.Application/ElectronSign/Queries/ContractTemplateQueryHandler.cs
@@ -21,17 +21,20 @@
IRepository<ContractTemplate> rep,
IRepository<Enterprise> repEnterprise,
IRepository<User> repUser,
- IRepository<DbAuditLog, LogDbContextLocator> repDbAuditLog
+ IRepository<DbAuditLog, LogDbContextLocator> repDbAuditLog,
+ IRepository<EnterpriseElectronSignSetting> repEnterpriseElectronSignSetting
) :
IRequestHandler<GetContractTemplateEnterprisesQuery, GetContractTemplateEnterprisesQueryResult>,
IRequestHandler<GetEnterpriseContractTemplatesQuery, GetEnterpriseContractTemplatesQueryResult>,
IRequestHandler<GetEnterpriseContractTemplateLogsQuery, GetEnterpriseContractTemplateLogsQueryResult>,
- IRequestHandler<GetContractTemplateQuery, GetContractTemplateQueryResult>
+ IRequestHandler<GetContractTemplateQuery, GetContractTemplateQueryResult>,
+ IRequestHandler<GetEnterpriseContractTemplateSelectQuery, List<SelectOption<Guid, GetEnterpriseContractTemplateSelectQueryOption>>>
{
private readonly IRepository<ContractTemplate> rep = rep;
private readonly IRepository<Enterprise> repEnterprise = repEnterprise;
private readonly IRepository<User> repUser = repUser;
private readonly IRepository<DbAuditLog, LogDbContextLocator> repDbAuditLog = repDbAuditLog;
+ private readonly IRepository<EnterpriseElectronSignSetting> repEnterpriseElectronSignSetting = repEnterpriseElectronSignSetting;
/// <summary>
/// 鏌ヨ杩愯惀绔崗璁鐞嗗垪琛�
@@ -159,6 +162,10 @@
"IsDeleted",
"Values",
"TemplateId",
+ "TemplateEditData",
+ "TemplateJsonData",
+ "BindProperty",
+ "ElectronSignContractTemplateId"
};
var properties = type.GetProperties().Where(it => !ignorePropertyNames.Contains(it.Name)).ToList();
var traceIds = result.Data.DistinctSelect(it => it.TraceId);
@@ -214,6 +221,27 @@
return model;
}
+ /// <summary>
+ /// 鏌ヨ浼佷笟鍚堝悓妯℃澘閫夋嫨鍣ㄦ暟鎹�
+ /// </summary>
+ /// <param name="request"></param>
+ /// <param name="cancellationToken"></param>
+ /// <returns></returns>
+ public async Task<List<SelectOption<Guid, GetEnterpriseContractTemplateSelectQueryOption>>> Handle(GetEnterpriseContractTemplateSelectQuery request, CancellationToken cancellationToken)
+ {
+ var logier = JwtUtils.GetCurrentLogier();
+
+ var accesses = await repEnterpriseElectronSignSetting.AsQueryable()
+ .Where(it => it.EnterpriseId == logier.EnterpriseId)
+ .Select(it => it.ElectronSignAccess)
+ .ToListAsync();
+ return await request.GetSelect<ContractTemplate, Guid, GetEnterpriseContractTemplateSelectQueryOption>(
+ it => it.Id,
+ it => it.Name,
+ q => q.Where(it => it.EnterpriseId == logier.EnterpriseId && !it.IsDisabled && it.Status== EnumContractTemplateStatus.Completed && it.Access.HasValue && accesses.Contains(it.Access.Value)),
+ cancellationToken);
+ }
+
private async Task AddContractTemplateLogsAsync(
GetEnterpriseContractTemplateLogsQueryResultItem item,
List<PropertyInfo> properties,
--
Gitblit v1.9.1