From b4c3f56a8d3d48e64eed574e851ddae0739648d9 Mon Sep 17 00:00:00 2001 From: wxd <270608793@qq.com> Date: Fri, 21 Apr 2023 17:41:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../GuideTypes/GuideTypeAppService.cs | 5 ++-- .../MedicalReportTypeAppService.cs | 4 +-- src/Shentun.Peis.Domain/EntityHelper.cs | 9 +++---- .../GuideTypes/GuideTypeManager.cs | 25 +++++++++++++++++-- .../MedicalReportTypeManager.cs | 25 ++++++++++++++++++- 5 files changed, 56 insertions(+), 12 deletions(-) diff --git a/src/Shentun.Peis.Application/GuideTypes/GuideTypeAppService.cs b/src/Shentun.Peis.Application/GuideTypes/GuideTypeAppService.cs index 02dfcf5..395d7d8 100644 --- a/src/Shentun.Peis.Application/GuideTypes/GuideTypeAppService.cs +++ b/src/Shentun.Peis.Application/GuideTypes/GuideTypeAppService.cs @@ -7,6 +7,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using TencentCloud.Cme.V20191029.Models; using Volo.Abp; using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Services; @@ -111,7 +112,7 @@ namespace Shentun.Peis.GuideTypes [HttpPut("api/app/guidetype/updatesort")] public async Task UpdateSortAsync(Guid id, Guid targetid) { - await EntityHelper.UpdateSort(Repository, id, targetid); + await _manager.UpdateSortAsync(id, targetid); } /// @@ -123,7 +124,7 @@ namespace Shentun.Peis.GuideTypes [HttpPut("api/app/guidetype/updatemanysort")] public async Task UpdateManySortAsync(Guid id, int SortType) { - await EntityHelper.UpdateManySortAsync(Repository, id, SortType); + await _manager.UpdateManySortAsync(id, SortType); } } } diff --git a/src/Shentun.Peis.Application/MedicalReportTypes/MedicalReportTypeAppService.cs b/src/Shentun.Peis.Application/MedicalReportTypes/MedicalReportTypeAppService.cs index eedce63..2f9eb87 100644 --- a/src/Shentun.Peis.Application/MedicalReportTypes/MedicalReportTypeAppService.cs +++ b/src/Shentun.Peis.Application/MedicalReportTypes/MedicalReportTypeAppService.cs @@ -108,7 +108,7 @@ namespace Shentun.Peis.MedicalReportTypes [HttpPut("api/app/medicalreporttype/updatesort")] public async Task UpdateSortAsync(Guid id, Guid targetid) { - await EntityHelper.UpdateSort(Repository, id, targetid); + await _manager.UpdateSortAsync(id, targetid); } /// @@ -120,7 +120,7 @@ namespace Shentun.Peis.MedicalReportTypes [HttpPut("api/app/medicalreporttype/updatemanysort")] public async Task UpdateManySortAsync(Guid id, int SortType) { - await EntityHelper.UpdateManySortAsync(Repository, id, SortType); + await _manager.UpdateManySortAsync(id, SortType); } } } diff --git a/src/Shentun.Peis.Domain/EntityHelper.cs b/src/Shentun.Peis.Domain/EntityHelper.cs index bcf698a..54e95bc 100644 --- a/src/Shentun.Peis.Domain/EntityHelper.cs +++ b/src/Shentun.Peis.Domain/EntityHelper.cs @@ -4,7 +4,6 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Volo.Abp.Auditing; using Volo.Abp; using Volo.Abp.Domain.Entities; using Volo.Abp.Domain.Repositories; @@ -125,21 +124,21 @@ namespace Shentun.Peis /// /// /// - public static async Task CheckSameName(IRepository repository,string name, TEntity updatedEntity = null) + public static async Task CheckSameName(IRepository repository, string name, TEntity updatedEntity = null) where TEntity : class, IEntity, IDisplayName { Check.NotNullOrWhiteSpace(name, nameof(name)); TEntity existEntity; - + if (updatedEntity == null) { existEntity = await repository.FindAsync(o => o.DisplayName == name); } - else + else { existEntity = await repository.FindAsync(o => o.Id.ToString() != updatedEntity.Id.ToString() && o.DisplayName == name); } - + if (existEntity != null) { diff --git a/src/Shentun.Peis.Domain/GuideTypes/GuideTypeManager.cs b/src/Shentun.Peis.Domain/GuideTypes/GuideTypeManager.cs index 00c1579..479f08c 100644 --- a/src/Shentun.Peis.Domain/GuideTypes/GuideTypeManager.cs +++ b/src/Shentun.Peis.Domain/GuideTypes/GuideTypeManager.cs @@ -66,7 +66,28 @@ namespace Shentun.Peis.GuidTypes } } - - + + + /// + /// 修改排序 相邻之间 + /// + /// 需要修改的ID + /// 目标ID + public async Task UpdateSortAsync(Guid id, Guid targetid) + { + await EntityHelper.UpdateSort(_repository, id, targetid); + } + + /// + /// 修改排序 置顶，置底 + /// + /// 需要修改的ID + /// 修改方式：1 置顶 2 置底 + /// + public async Task UpdateManySortAsync(Guid id, int SortType) + { + await EntityHelper.UpdateManySortAsync(_repository, id, SortType); + } + } } diff --git a/src/Shentun.Peis.Domain/MedicalReportTypes/MedicalReportTypeManager.cs b/src/Shentun.Peis.Domain/MedicalReportTypes/MedicalReportTypeManager.cs index cee499a..ab4f483 100644 --- a/src/Shentun.Peis.Domain/MedicalReportTypes/MedicalReportTypeManager.cs +++ b/src/Shentun.Peis.Domain/MedicalReportTypes/MedicalReportTypeManager.cs @@ -63,6 +63,29 @@ namespace Shentun.Peis.MedicalReportTypes } } - + + + + /// + /// 修改排序 相邻之间 + /// + /// 需要修改的ID + /// 目标ID + public async Task UpdateSortAsync(Guid id, Guid targetid) + { + await EntityHelper.UpdateSort(_repository, id, targetid); + } + + /// + /// 修改排序 置顶，置底 + /// + /// 需要修改的ID + /// 修改方式：1 置顶 2 置底 + /// + public async Task UpdateManySortAsync(Guid id, int SortType) + { + await EntityHelper.UpdateManySortAsync(_repository, id, SortType); + } + } }