修改相关bug

SimpleAdmin.Application/Services/Onboarding/Task/OnboardingTaskService.cs

@@ -95,11 +95,13 @@ public class OnboardingTaskService : IOnboardingTaskService
             throw Oops.Bah("入职模板包含不适用于当前岗位的合同模板");
 
         var versionIds = contractConfigs.Select(item => item.ContractTemplateVersionId).Distinct().ToList();
-        var enabledVersionCount = await _db.Queryable<ObContractTemplateVersion>()
-            .CountAsync(item => versionIds.Contains(item.Id)
-                                && item.VersionStatus == ContractTemplateVersionStatus.Enabled);
-        if (enabledVersionCount != versionIds.Count)
-            throw Oops.Bah("入职模板包含未启用的合同版本，请先调整模板配置");
+        var now = DateTime.Now;
+        var taskVersions = await _db.Queryable<ObContractTemplateVersion>()
+            .Where(item => versionIds.Contains(item.Id))
+            .ToListAsync();
+        if (taskVersions.Count != versionIds.Count
+            || taskVersions.Any(item => !ContractTemplateVersionValidity.IsAvailable(item, now)))
+            throw Oops.Bah("入职模板包含未生效、已失效或未启用的签署材料版本，请先调整模板配置");
 
         var materialIds = materialConfigs.Select(item => item.MaterialTypeId).Distinct().ToList();
         var materialTypes = materialIds.Count == 0
@@ -290,11 +292,13 @@ public class OnboardingTaskService : IOnboardingTaskService
             .Select(item => item.TemplateVersionId)
             .Distinct()
             .ToList();
-        var enabledVersionCount = await _db.Queryable<ObContractTemplateVersion>()
-            .CountAsync(item => versionIds.Contains(item.Id)
-                                && item.VersionStatus == ContractTemplateVersionStatus.Enabled);
-        if (enabledVersionCount != versionIds.Count)
-            throw Oops.Bah("原任务包含已停用的合同版本，不能继续复制");
+        var now = DateTime.Now;
+        var copyVersions = await _db.Queryable<ObContractTemplateVersion>()
+            .Where(item => versionIds.Contains(item.Id))
+            .ToListAsync();
+        if (copyVersions.Count != versionIds.Count
+            || copyVersions.Any(item => !ContractTemplateVersionValidity.IsAvailable(item, now)))
+            throw Oops.Bah("原任务包含未生效、已失效或未启用的签署材料版本，不能继续复制");
 
         var sourceMaterialRequirements = await _db.Queryable<ObTaskMaterialRequirement>()
             .Where(item => item.TaskId == sourceTask.Id)