yuanlin/OnboardXAdmin
2
0
Fork 0
Code Pull Requests Actions Releases Activity

逻辑调整

Browse Source
This commit is contained in:
fuenmao
2026-08-25 10:20:53 +08:00
parent 4679bd6c13
commit 085bf5e2ab
36 changed files with 2770 additions and 1209 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SimpleAdmin.Application/Services/Onboarding/EntryConfig/Dto/OnboardingEntryConfigInput.cs
-76
View File
@@ -91,79 +91,3 @@ public class OnboardingMaterialTypeSaveInput
/// </summary>
public string Status { get; set; } = "enable";
}
/// <summary>
/// 保存公司岗位动态字段要求参数。
/// </summary>
public class OnboardingFormRequirementSaveInput
{
/// <summary>
/// 业务数据 Id。
/// </summary>
public long? Id { get; set; }
/// <summary>
/// 入职业务公司 Id。
/// </summary>
[IdNotNull(ErrorMessage = "公司Id不能为空")]
public long CompanyId { get; set; }
/// <summary>
/// 岗位 Id；为空时表示公司级配置。
/// </summary>
public long? PositionId { get; set; }
/// <summary>
/// 动态字段 Id。
/// </summary>
[IdNotNull(ErrorMessage = "字段Id不能为空")]
public long FieldId { get; set; }
/// <summary>
/// 是否必填、必传或必签。
/// </summary>
public bool Required { get; set; }
/// <summary>
/// 显示排序码。
/// </summary>
public int? SortCode { get; set; }
}
/// <summary>
/// 保存公司岗位材料要求参数。
/// </summary>
public class OnboardingMaterialRequirementSaveInput
{
/// <summary>
/// 业务数据 Id。
/// </summary>
public long? Id { get; set; }
/// <summary>
/// 入职业务公司 Id。
/// </summary>
[IdNotNull(ErrorMessage = "公司Id不能为空")]
public long CompanyId { get; set; }
/// <summary>
/// 岗位 Id；为空时表示公司级配置。
/// </summary>
public long? PositionId { get; set; }
/// <summary>
/// 材料类型 Id。
/// </summary>
[IdNotNull(ErrorMessage = "资料类型Id不能为空")]
public long MaterialTypeId { get; set; }
/// <summary>
/// 是否必填、必传或必签。
/// </summary>
public bool Required { get; set; }
/// <summary>
/// 显示排序码。
/// </summary>
public int? SortCode { get; set; }
}
SimpleAdmin.Application/Services/Onboarding/EntryConfig/IOnboardingEntryConfigService.cs
+9 -28
View File
@@ -1,7 +1,7 @@
namespace SimpleAdmin.Application;
/// <summary>
/// 定义动态字段、材料类型及公司岗位要求配置业务能力。
/// 定义员工动态补充字段与上传材料类型的基础配置能力。
/// </summary>
public interface IOnboardingEntryConfigService : ITransient
{
@@ -9,48 +9,29 @@ public interface IOnboardingEntryConfigService : ITransient
/// 查询全部动态入职字段。
/// </summary>
Task<List<ObFormField>> ListFormFields();
/// <summary>
/// 新增或编辑动态入职字段。
/// </summary>
Task SaveFormField(OnboardingFormFieldSaveInput input);
/// <summary>
/// 删除未被填写要求引用的动态字段。
/// 删除未被入职模板引用的动态字段。
/// </summary>
Task DeleteFormFields(BaseIdListInput input);
/// <summary>
/// 查询全部入职材料类型。
/// </summary>
Task<List<ObMaterialType>> ListMaterialTypes();
/// <summary>
/// 新增或编辑入职材料类型。
/// </summary>
Task SaveMaterialType(OnboardingMaterialTypeSaveInput input);
/// <summary>
/// 删除未被要求或上传记录引用的材料类型。
/// 删除未被入职模板或上传记录引用的材料类型。
/// </summary>
Task DeleteMaterialTypes(BaseIdListInput input);
/// <summary>
/// 查询指定公司的动态字段填写要求。
/// </summary>
Task<List<ObFormRequirement>> ListFormRequirements(long companyId);
/// <summary>
/// 新增或编辑公司岗位动态字段要求。
/// </summary>
Task SaveFormRequirement(OnboardingFormRequirementSaveInput input);
/// <summary>
/// 删除动态字段填写要求。
/// </summary>
Task DeleteFormRequirements(BaseIdListInput input);
/// <summary>
/// 查询指定公司的材料上传要求。
/// </summary>
Task<List<ObMaterialRequirement>> ListMaterialRequirements(long companyId);
/// <summary>
/// 新增或编辑公司岗位材料要求。
/// </summary>
Task SaveMaterialRequirement(OnboardingMaterialRequirementSaveInput input);
/// <summary>
/// 删除材料上传要求。
/// </summary>
Task DeleteMaterialRequirements(BaseIdListInput input);
}
}
SimpleAdmin.Application/Services/Onboarding/EntryConfig/OnboardingEntryConfigService.cs
+10 -144
View File
@@ -1,7 +1,7 @@
namespace SimpleAdmin.Application;
/// <summary>
/// 维护员工端动态字段、材料类型及公司岗位要求。
/// 维护员工端动态补充字段和材料类型；与公司、岗位的组合关系由入职模板统一管理。
/// </summary>
public class OnboardingEntryConfigService : IOnboardingEntryConfigService
{
@@ -92,8 +92,10 @@ public class OnboardingEntryConfigService : IOnboardingEntryConfigService
var isReferenced = await _db.Queryable<ObFormRequirement>()
.AnyAsync(x => input.Ids.Contains(x.FieldId));
if (isReferenced)
throw Oops.Bah("字段已被填写要求引用，不能删除");
var isReferencedByTemplate = await _db.Queryable<ObOnboardingTemplateFormField>()
.AnyAsync(x => input.Ids.Contains(x.FieldId));
if (isReferenced || isReferencedByTemplate)
throw Oops.Bah("字段已被入职模板引用，不能删除");
await _db.Deleteable<ObFormField>().In(input.Ids).ExecuteCommandAsync();
}
@@ -155,8 +157,10 @@ public class OnboardingEntryConfigService : IOnboardingEntryConfigService
var isReferenced = await _db.Queryable<ObMaterialRequirement>()
.AnyAsync(x => input.Ids.Contains(x.MaterialTypeId));
if (isReferenced)
throw Oops.Bah("资料类型已被资料要求引用，不能删除");
var isReferencedByTemplate = await _db.Queryable<ObOnboardingTemplateMaterial>()
.AnyAsync(x => input.Ids.Contains(x.MaterialTypeId));
if (isReferenced || isReferencedByTemplate)
throw Oops.Bah("资料类型已被入职模板引用，不能删除");
var hasUploads = await _db.Queryable<ObTaskMaterial>()
.AnyAsync(x => input.Ids.Contains(x.MaterialTypeId));
@@ -165,142 +169,4 @@ public class OnboardingEntryConfigService : IOnboardingEntryConfigService
await _db.Deleteable<ObMaterialType>().In(input.Ids).ExecuteCommandAsync();
}
/// <summary>
/// 查询指定公司的动态字段填写要求。
/// </summary>
public Task<List<ObFormRequirement>> ListFormRequirements(long companyId)
{
return _db.Queryable<ObFormRequirement>()
.Where(x => x.CompanyId == companyId)
.OrderBy(x => x.SortCode)
.ToListAsync();
}
/// <summary>
/// 新增或编辑公司岗位动态字段要求。
/// </summary>
public async Task SaveFormRequirement(OnboardingFormRequirementSaveInput input)
{
await EnsureCompanyAndPosition(input.CompanyId, input.PositionId);
var fieldExists = await _db.Queryable<ObFormField>()
.AnyAsync(x => x.Id == input.FieldId && x.Status == "enable");
if (!fieldExists)
throw Oops.Bah("动态字段不存在或未启用");
var requirementExists = await _db.Queryable<ObFormRequirement>()
.AnyAsync(x => x.CompanyId == input.CompanyId
&& x.PositionId == input.PositionId
&& x.FieldId == input.FieldId
&& x.Id != input.Id);
if (requirementExists)
throw Oops.Bah("该公司、岗位和字段的要求已存在");
var entity = new ObFormRequirement
{
Id = input.Id ?? global::SimpleAdmin.Core.Utils.CommonUtils.GetSingleId(),
CompanyId = input.CompanyId,
PositionId = input.PositionId,
FieldId = input.FieldId,
Required = input.Required,
SortCode = input.SortCode
};
if (input.Id.HasValue)
{
await _db.Updateable(entity).ExecuteCommandAsync();
return;
}
await _db.Insertable(entity).ExecuteCommandAsync();
}
/// <summary>
/// 删除动态字段填写要求。
/// </summary>
public Task DeleteFormRequirements(BaseIdListInput input)
{
if (input.Ids.Count == 0)
return Task.CompletedTask;
return _db.Deleteable<ObFormRequirement>().In(input.Ids).ExecuteCommandAsync();
}
/// <summary>
/// 查询指定公司的材料上传要求。
/// </summary>
public Task<List<ObMaterialRequirement>> ListMaterialRequirements(long companyId)
{
return _db.Queryable<ObMaterialRequirement>()
.Where(x => x.CompanyId == companyId)
.OrderBy(x => x.SortCode)
.ToListAsync();
}
/// <summary>
/// 新增或编辑公司岗位材料要求。
/// </summary>
public async Task SaveMaterialRequirement(OnboardingMaterialRequirementSaveInput input)
{
await EnsureCompanyAndPosition(input.CompanyId, input.PositionId);
var materialTypeExists = await _db.Queryable<ObMaterialType>()
.AnyAsync(x => x.Id == input.MaterialTypeId && x.Status == "enable");
if (!materialTypeExists)
throw Oops.Bah("资料类型不存在或未启用");
var requirementExists = await _db.Queryable<ObMaterialRequirement>()
.AnyAsync(x => x.CompanyId == input.CompanyId
&& x.PositionId == input.PositionId
&& x.MaterialTypeId == input.MaterialTypeId
&& x.Id != input.Id);
if (requirementExists)
throw Oops.Bah("该公司、岗位和资料类型的要求已存在");
var entity = new ObMaterialRequirement
{
Id = input.Id ?? global::SimpleAdmin.Core.Utils.CommonUtils.GetSingleId(),
CompanyId = input.CompanyId,
PositionId = input.PositionId,
MaterialTypeId = input.MaterialTypeId,
Required = input.Required,
SortCode = input.SortCode
};
if (input.Id.HasValue)
{
await _db.Updateable(entity).ExecuteCommandAsync();
return;
}
await _db.Insertable(entity).ExecuteCommandAsync();
}
/// <summary>
/// 删除材料上传要求。
/// </summary>
public Task DeleteMaterialRequirements(BaseIdListInput input)
{
if (input.Ids.Count == 0)
return Task.CompletedTask;
return _db.Deleteable<ObMaterialRequirement>().In(input.Ids).ExecuteCommandAsync();
}
private async Task EnsureCompanyAndPosition(long companyId, long? positionId)
{
var companyExists = await _db.Queryable<ObCompany>()
.AnyAsync(x => x.Id == companyId && x.Status == "enable");
if (!companyExists)
throw Oops.Bah("公司不存在或未启用");
if (!positionId.HasValue)
return;
var positionExists = await _db.Queryable<ObPosition>()
.AnyAsync(x => x.Id == positionId.Value && x.CompanyId == companyId && x.Status == "enable");
if (!positionExists)
throw Oops.Bah("岗位不存在、未启用或不属于该公司");
}
}
}