diff --git a/src/Shentun.Peis.Application/DiagnosisTemplates/DiagnosisTemplateAppService.cs b/src/Shentun.Peis.Application/DiagnosisTemplates/DiagnosisTemplateAppService.cs index 6c09a65..8b51878 100644 --- a/src/Shentun.Peis.Application/DiagnosisTemplates/DiagnosisTemplateAppService.cs +++ b/src/Shentun.Peis.Application/DiagnosisTemplates/DiagnosisTemplateAppService.cs @@ -10,6 +10,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using Volo.Abp; using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Services; using Volo.Abp.Domain.Repositories; @@ -139,23 +140,14 @@ namespace Shentun.Peis.DiagnosisTemplates /// /// /// - public override Task DeleteAsync(Guid id) + public override async Task DeleteAsync(Guid id) { - return base.DeleteAsync(id); + await _manager.CheckAndDeleteAsync(id); } - /// - /// 修改排序 相邻之间 - /// - /// 需要修改的ID - /// 目标ID - [HttpPut("api/app/diagnosistemplate/updatesort")] - public async Task UpdateSortAsync(Guid id, Guid targetid) - { - await _manager.UpdateSortAsync(id, targetid); - } + /// /// 修改排序 置顶,置底 @@ -179,5 +171,9 @@ namespace Shentun.Peis.DiagnosisTemplates { await _manager.UpdateSortManyAsync(input); } + + + + } } diff --git a/src/Shentun.Peis.Application/ItemTemplates/ItemTemplateAppService.cs b/src/Shentun.Peis.Application/ItemTemplates/ItemTemplateAppService.cs index 90410c5..7fe8c2b 100644 --- a/src/Shentun.Peis.Application/ItemTemplates/ItemTemplateAppService.cs +++ b/src/Shentun.Peis.Application/ItemTemplates/ItemTemplateAppService.cs @@ -141,23 +141,14 @@ namespace Shentun.Peis.ItemTemplates /// /// /// - public override Task DeleteAsync(Guid id) + public override async Task DeleteAsync(Guid id) { - return base.DeleteAsync(id); + await _manager.CheckAndDeleteAsync(id); } - /// - /// 修改排序 相邻之间 - /// - /// 需要修改的ID - /// 目标ID - [HttpPut("api/app/itemtemplate/updatesort")] - public async Task UpdateSortAsync(Guid id, Guid targetid) - { - await _manager.UpdateSortAsync(id, targetid); - } + /// /// 修改排序 置顶,置底 diff --git a/src/Shentun.Peis.Domain/DiagnosisTemplates/DiagnosisTemplateManager.cs b/src/Shentun.Peis.Domain/DiagnosisTemplates/DiagnosisTemplateManager.cs index e521da9..9115146 100644 --- a/src/Shentun.Peis.Domain/DiagnosisTemplates/DiagnosisTemplateManager.cs +++ b/src/Shentun.Peis.Domain/DiagnosisTemplates/DiagnosisTemplateManager.cs @@ -19,9 +19,13 @@ namespace Shentun.Peis.DiagnosisTemplates public class DiagnosisTemplateManager : DomainService { private readonly IRepository _repository; - public DiagnosisTemplateManager(IRepository repository) + private readonly IRepository _diagnosisTemplateDetailRepository; + public DiagnosisTemplateManager( + IRepository repository, + IRepository diagnosisTemplateDetailRepository) { _repository = repository; + _diagnosisTemplateDetailRepository = diagnosisTemplateDetailRepository; } /// /// 创建 @@ -34,11 +38,11 @@ namespace Shentun.Peis.DiagnosisTemplates { DataHelper.CheckStringIsNull(entity.DisplayName, "名称"); await EntityHelper.CheckSameName(_repository, entity.DisplayName); - if (entity.DisplayName.Length > 1) - { + //if (entity.DisplayName.Length > 1) + //{ - throw new UserFriendlyException($"DisplayName:'{entity.DisplayName}'字符超出长度"); - } + // throw new UserFriendlyException($"DisplayName:'{entity.DisplayName}'字符超出长度"); + //} return new DiagnosisTemplate { DisplayName = entity.DisplayName, @@ -59,10 +63,10 @@ namespace Shentun.Peis.DiagnosisTemplates { DataHelper.CheckStringIsNull(sourceEntity.DisplayName, "名称"); - if (sourceEntity.DisplayName.Length > 1) - { - throw new UserFriendlyException($"DisplayName:'{sourceEntity.DisplayName}'字符超出长度"); - } + //if (sourceEntity.DisplayName.Length > 1) + //{ + // throw new UserFriendlyException($"DisplayName:'{sourceEntity.DisplayName}'字符超出长度"); + //} if (sourceEntity.DisplayName != targetEntity.DisplayName) { @@ -76,18 +80,7 @@ namespace Shentun.Peis.DiagnosisTemplates } - - - - /// - /// 修改排序 相邻之间 - /// - /// 需要修改的ID - /// 目标ID - public async Task UpdateSortAsync(Guid id, Guid targetid) - { - await EntityHelper.UpdateSort(_repository, id, targetid); - } + /// /// 修改排序 置顶,置底 @@ -112,6 +105,21 @@ namespace Shentun.Peis.DiagnosisTemplates public async Task UpdateSortManyAsync(UpdateSortManyDto input) { await EntityHelper.UpdateSortManyAsync(_repository, input); + } + + + /// + ///删除 + /// + /// + /// + /// + public async Task CheckAndDeleteAsync(Guid id) + { + //删除诊断模板明细 + await _diagnosisTemplateDetailRepository.DeleteAsync(d => d.DiagnosisTemplateId == id); + //删除诊断模板数据 + await _repository.DeleteAsync(id); } diff --git a/src/Shentun.Peis.Domain/ItemTemplates/ItemTemplateManager.cs b/src/Shentun.Peis.Domain/ItemTemplates/ItemTemplateManager.cs index e46a9ab..cf9c946 100644 --- a/src/Shentun.Peis.Domain/ItemTemplates/ItemTemplateManager.cs +++ b/src/Shentun.Peis.Domain/ItemTemplates/ItemTemplateManager.cs @@ -20,9 +20,13 @@ namespace Shentun.Peis.ItemTemplates public class ItemTemplateManager : DomainService { private readonly IRepository _repository; - public ItemTemplateManager(IRepository repository) + private readonly IRepository _itemTemplateDetailRepository; + public ItemTemplateManager( + IRepository repository, + IRepository itemTemplateDetailRepository) { _repository = repository; + _itemTemplateDetailRepository = itemTemplateDetailRepository; } /// @@ -69,15 +73,7 @@ namespace Shentun.Peis.ItemTemplates } - /// - /// 修改排序 相邻之间 - /// - /// 需要修改的ID - /// 目标ID - public async Task UpdateSortAsync(Guid id, Guid targetid) - { - await EntityHelper.UpdateSort(_repository, id, targetid); - } + /// /// 修改排序 置顶,置底 @@ -103,5 +99,21 @@ namespace Shentun.Peis.ItemTemplates } + /// + ///删除 + /// + /// + /// + /// + public async Task CheckAndDeleteAsync(Guid id) + { + //删除项目模板明细 + await _itemTemplateDetailRepository.DeleteAsync(d => d.ItemTemplateId == id); + //删除项目模板数据 + await _repository.DeleteAsync(id); + + } + + } }