diff --git a/SimpleAdmin.Application/Services/Onboarding/Audit/OnboardingAuditService.cs b/SimpleAdmin.Application/Services/Onboarding/Audit/OnboardingAuditService.cs index 84f77b9..115a312 100644 --- a/SimpleAdmin.Application/Services/Onboarding/Audit/OnboardingAuditService.cs +++ b/SimpleAdmin.Application/Services/Onboarding/Audit/OnboardingAuditService.cs @@ -2,16 +2,15 @@ namespace SimpleAdmin.Application; public class OnboardingAuditService : IOnboardingAuditService { - private readonly ISqlSugarClient _db; + private readonly SqlSugarScope _db; private readonly IConfigService _config; private readonly IOnboardingContractSnapshotService _snapshotService; public OnboardingAuditService( - ISqlSugarClient db, IConfigService config, IOnboardingContractSnapshotService snapshotService) { - _db = db; + _db = DbContext.DB; _config = config; _snapshotService = snapshotService; } @@ -127,3 +126,5 @@ public class OnboardingAuditService : IOnboardingAuditService }).ExecuteCommandAsync(); } } + + diff --git a/SimpleAdmin.Application/Services/Onboarding/ContractDocument/OnboardingContractDocumentService.cs b/SimpleAdmin.Application/Services/Onboarding/ContractDocument/OnboardingContractDocumentService.cs index 54dffd8..c49de91 100644 --- a/SimpleAdmin.Application/Services/Onboarding/ContractDocument/OnboardingContractDocumentService.cs +++ b/SimpleAdmin.Application/Services/Onboarding/ContractDocument/OnboardingContractDocumentService.cs @@ -2,12 +2,12 @@ namespace SimpleAdmin.Application; public class OnboardingContractDocumentService : IOnboardingContractDocumentService { - private readonly ISqlSugarClient _db; + private readonly SqlSugarScope _db; private readonly IFileService _fileService; - public OnboardingContractDocumentService(ISqlSugarClient db, IFileService fileService) + public OnboardingContractDocumentService(IFileService fileService) { - _db = db; + _db = DbContext.DB; _fileService = fileService; } @@ -95,3 +95,5 @@ public class OnboardingContractDocumentService : IOnboardingContractDocumentServ return output.ToArray(); } } + + diff --git a/SimpleAdmin.Application/Services/Onboarding/ContractSnapshot/OnboardingContractSnapshotService.cs b/SimpleAdmin.Application/Services/Onboarding/ContractSnapshot/OnboardingContractSnapshotService.cs index 7e4de73..3595834 100644 --- a/SimpleAdmin.Application/Services/Onboarding/ContractSnapshot/OnboardingContractSnapshotService.cs +++ b/SimpleAdmin.Application/Services/Onboarding/ContractSnapshot/OnboardingContractSnapshotService.cs @@ -3,8 +3,8 @@ namespace SimpleAdmin.Application; /// 冻结任务合同变量;DOCX 生成阶段只读取本快照,不再读取模板实时值。 public class OnboardingContractSnapshotService : IOnboardingContractSnapshotService { - private readonly ISqlSugarClient _db; - public OnboardingContractSnapshotService(ISqlSugarClient db) => _db = db; + private readonly SqlSugarScope _db; + public OnboardingContractSnapshotService() => _db = DbContext.DB; public async Task Build(long taskId, ObTaskEmployeeInfo employeeInfo = null) { @@ -79,4 +79,5 @@ public class OnboardingContractSnapshotService : IOnboardingContractSnapshotServ _ => definition.VariableCode }; } -} \ No newline at end of file +} + diff --git a/SimpleAdmin.Application/Services/Onboarding/Employee/OnboardingEmployeeService.cs b/SimpleAdmin.Application/Services/Onboarding/Employee/OnboardingEmployeeService.cs index 06630a3..2471277 100644 --- a/SimpleAdmin.Application/Services/Onboarding/Employee/OnboardingEmployeeService.cs +++ b/SimpleAdmin.Application/Services/Onboarding/Employee/OnboardingEmployeeService.cs @@ -3,8 +3,8 @@ namespace SimpleAdmin.Application; /// 仅展示审核通过后创建的正式员工档案;入职资料的来源任务可追溯。 public class OnboardingEmployeeService : IOnboardingEmployeeService { - private readonly ISqlSugarClient _db; - public OnboardingEmployeeService(ISqlSugarClient db) => _db = db; + private readonly SqlSugarScope _db; + public OnboardingEmployeeService() => _db = DbContext.DB; public Task> Page(OnboardingEmployeePageInput input) => _db.Queryable() .WhereIF(!string.IsNullOrWhiteSpace(input.EmployeeName), x => x.EmployeeName.Contains(input.EmployeeName) || x.IdCardNumber.Contains(input.EmployeeName)) @@ -21,4 +21,5 @@ public class OnboardingEmployeeService : IOnboardingEmployeeService var audits = task == null ? new List() : await _db.Queryable().Where(x => x.TaskId == task.Id).OrderByDescending(x => x.AuditedAt).ToListAsync(); return new OnboardingEmployeeDetailOutput { Employee = employee, Task = task, Contracts = contracts, Audits = audits }; } -} \ No newline at end of file +} + diff --git a/SimpleAdmin.Application/Services/Onboarding/EntryConfig/OnboardingEntryConfigService.cs b/SimpleAdmin.Application/Services/Onboarding/EntryConfig/OnboardingEntryConfigService.cs index 89bf0d7..02c9c16 100644 --- a/SimpleAdmin.Application/Services/Onboarding/EntryConfig/OnboardingEntryConfigService.cs +++ b/SimpleAdmin.Application/Services/Onboarding/EntryConfig/OnboardingEntryConfigService.cs @@ -5,11 +5,11 @@ namespace SimpleAdmin.Application; /// public class OnboardingEntryConfigService : IOnboardingEntryConfigService { - private readonly ISqlSugarClient _db; + private readonly SqlSugarScope _db; - public OnboardingEntryConfigService(ISqlSugarClient db) + public OnboardingEntryConfigService() { - _db = db; + _db = DbContext.DB; } public Task> ListFormFields() @@ -243,3 +243,5 @@ public class OnboardingEntryConfigService : IOnboardingEntryConfigService throw Oops.Bah("岗位不存在、未启用或不属于该公司"); } } + + diff --git a/SimpleAdmin.Application/Services/Onboarding/Lifecycle/OnboardingTaskLifecycleService.cs b/SimpleAdmin.Application/Services/Onboarding/Lifecycle/OnboardingTaskLifecycleService.cs index b15e638..bc0f268 100644 --- a/SimpleAdmin.Application/Services/Onboarding/Lifecycle/OnboardingTaskLifecycleService.cs +++ b/SimpleAdmin.Application/Services/Onboarding/Lifecycle/OnboardingTaskLifecycleService.cs @@ -2,12 +2,12 @@ namespace SimpleAdmin.Application; public class OnboardingTaskLifecycleService : IOnboardingTaskLifecycleService { - private readonly ISqlSugarClient _db; + private readonly SqlSugarScope _db; private readonly IConfigService _config; - public OnboardingTaskLifecycleService(ISqlSugarClient db, IConfigService config) + public OnboardingTaskLifecycleService(IConfigService config) { - _db = db; + _db = DbContext.DB; _config = config; } @@ -87,4 +87,5 @@ public class OnboardingTaskLifecycleService : IOnboardingTaskLifecycleService AuditedAt = DateTime.Now }).ExecuteCommandAsync(); } -} \ No newline at end of file +} + diff --git a/SimpleAdmin.Application/Services/Onboarding/MaterialReview/OnboardingMaterialReviewService.cs b/SimpleAdmin.Application/Services/Onboarding/MaterialReview/OnboardingMaterialReviewService.cs index 04daeec..d688099 100644 --- a/SimpleAdmin.Application/Services/Onboarding/MaterialReview/OnboardingMaterialReviewService.cs +++ b/SimpleAdmin.Application/Services/Onboarding/MaterialReview/OnboardingMaterialReviewService.cs @@ -2,12 +2,12 @@ namespace SimpleAdmin.Application; public class OnboardingMaterialReviewService : IOnboardingMaterialReviewService { - private readonly ISqlSugarClient _db; + private readonly SqlSugarScope _db; private readonly IConfigService _config; - public OnboardingMaterialReviewService(ISqlSugarClient db, IConfigService config) + public OnboardingMaterialReviewService(IConfigService config) { - _db = db; + _db = DbContext.DB; _config = config; } @@ -62,4 +62,5 @@ public class OnboardingMaterialReviewService : IOnboardingMaterialReviewService throw Oops.Bah("您不是该入职任务的审核人"); } } -} \ No newline at end of file +} + diff --git a/SimpleAdmin.Application/Services/Onboarding/PublicSubmission/OnboardingPublicSubmissionService.cs b/SimpleAdmin.Application/Services/Onboarding/PublicSubmission/OnboardingPublicSubmissionService.cs index 49104a0..eb0b1a1 100644 --- a/SimpleAdmin.Application/Services/Onboarding/PublicSubmission/OnboardingPublicSubmissionService.cs +++ b/SimpleAdmin.Application/Services/Onboarding/PublicSubmission/OnboardingPublicSubmissionService.cs @@ -2,14 +2,13 @@ namespace SimpleAdmin.Application; public class OnboardingPublicSubmissionService : IOnboardingPublicSubmissionService { - private readonly ISqlSugarClient _db; + private readonly SqlSugarScope _db; private readonly IOnboardingContractSnapshotService _snapshotService; public OnboardingPublicSubmissionService( - ISqlSugarClient db, IOnboardingContractSnapshotService snapshotService) { - _db = db; + _db = DbContext.DB; _snapshotService = snapshotService; } @@ -263,3 +262,5 @@ public class OnboardingPublicSubmissionService : IOnboardingPublicSubmissionServ return task; } } + + diff --git a/SimpleAdmin.Application/Services/Onboarding/PublicTask/OnboardingPublicTaskService.cs b/SimpleAdmin.Application/Services/Onboarding/PublicTask/OnboardingPublicTaskService.cs index efb41e2..a082964 100644 --- a/SimpleAdmin.Application/Services/Onboarding/PublicTask/OnboardingPublicTaskService.cs +++ b/SimpleAdmin.Application/Services/Onboarding/PublicTask/OnboardingPublicTaskService.cs @@ -5,14 +5,13 @@ namespace SimpleAdmin.Application; /// public class OnboardingPublicTaskService : IOnboardingPublicTaskService { - private readonly ISqlSugarClient _db; + private readonly SqlSugarScope _db; private readonly IOnboardingContractSnapshotService _snapshotService; public OnboardingPublicTaskService( - ISqlSugarClient db, IOnboardingContractSnapshotService snapshotService) { - _db = db; + _db = DbContext.DB; _snapshotService = snapshotService; } @@ -154,3 +153,5 @@ public class OnboardingPublicTaskService : IOnboardingPublicTaskService return link; } } + + diff --git a/SimpleAdmin.Application/Services/Onboarding/Task/OnboardingTaskService.cs b/SimpleAdmin.Application/Services/Onboarding/Task/OnboardingTaskService.cs index b8e57e2..779b1bb 100644 --- a/SimpleAdmin.Application/Services/Onboarding/Task/OnboardingTaskService.cs +++ b/SimpleAdmin.Application/Services/Onboarding/Task/OnboardingTaskService.cs @@ -2,16 +2,15 @@ namespace SimpleAdmin.Application; public class OnboardingTaskService : IOnboardingTaskService { - private readonly ISqlSugarClient _db; + private readonly SqlSugarScope _db; private readonly IConfigService _configService; private readonly IOnboardingContractSnapshotService _snapshotService; public OnboardingTaskService( - ISqlSugarClient db, IConfigService configService, IOnboardingContractSnapshotService snapshotService) { - _db = db; + _db = DbContext.DB; _configService = configService; _snapshotService = snapshotService; } @@ -125,3 +124,5 @@ public class OnboardingTaskService : IOnboardingTaskService }; } } + + diff --git a/SimpleAdmin.Application/Services/Onboarding/TaskContractVariable/OnboardingTaskContractVariableService.cs b/SimpleAdmin.Application/Services/Onboarding/TaskContractVariable/OnboardingTaskContractVariableService.cs index 5fe51fc..91cfc49 100644 --- a/SimpleAdmin.Application/Services/Onboarding/TaskContractVariable/OnboardingTaskContractVariableService.cs +++ b/SimpleAdmin.Application/Services/Onboarding/TaskContractVariable/OnboardingTaskContractVariableService.cs @@ -5,10 +5,10 @@ namespace SimpleAdmin.Application; /// public class OnboardingTaskContractVariableService : IOnboardingTaskContractVariableService { - private readonly ISqlSugarClient _db; + private readonly SqlSugarScope _db; - public OnboardingTaskContractVariableService(ISqlSugarClient db) - => _db = db; + public OnboardingTaskContractVariableService() + => _db = DbContext.DB; public async Task> List( OnboardingTaskContractVariableQueryInput input) @@ -136,4 +136,5 @@ public class OnboardingTaskContractVariableService : IOnboardingTaskContractVari .ExecuteCommandAsync(); } } -} \ No newline at end of file +} + diff --git a/SimpleAdmin.Application/Services/Onboarding/TaskQuery/OnboardingTaskQueryService.cs b/SimpleAdmin.Application/Services/Onboarding/TaskQuery/OnboardingTaskQueryService.cs index b791910..b3ab815 100644 --- a/SimpleAdmin.Application/Services/Onboarding/TaskQuery/OnboardingTaskQueryService.cs +++ b/SimpleAdmin.Application/Services/Onboarding/TaskQuery/OnboardingTaskQueryService.cs @@ -2,11 +2,11 @@ namespace SimpleAdmin.Application; public class OnboardingTaskQueryService : IOnboardingTaskQueryService { - private readonly ISqlSugarClient _db; + private readonly SqlSugarScope _db; - public OnboardingTaskQueryService(ISqlSugarClient db) + public OnboardingTaskQueryService() { - _db = db; + _db = DbContext.DB; } public Task> Page(OnboardingTaskPageInput input) @@ -41,4 +41,5 @@ public class OnboardingTaskQueryService : IOnboardingTaskQueryService .ToListAsync() }; } -} \ No newline at end of file +} + diff --git a/SimpleAdmin.Application/SimpleAdmin.Application.xml b/SimpleAdmin.Application/SimpleAdmin.Application.xml index a06d95c..2ec50bd 100644 --- a/SimpleAdmin.Application/SimpleAdmin.Application.xml +++ b/SimpleAdmin.Application/SimpleAdmin.Application.xml @@ -124,7 +124,9 @@ - 管理端在链接发送前填写合同薪资、补贴等人事变量。 + + 管理端在链接发送前填写合同薪资、补贴等人事变量。 +