合并修改

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);
         }
 
         /// <summary>
@@ -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);
         }
     }
 }

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);
         }
 
         /// <summary>
@@ -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);
         }
     }
 }

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
         /// <param name="updatedEntity"></param>
         /// <returns></returns>
         /// <exception cref="UserFriendlyException"></exception>
-        public static async Task CheckSameName<TEntity,TKey>(IRepository<TEntity> repository,string name, TEntity updatedEntity = null)
+        public static async Task CheckSameName<TEntity, TKey>(IRepository<TEntity, TKey> repository, string name, TEntity updatedEntity = null)
            where TEntity : class, IEntity<TKey>, 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)
             {

src/Shentun.Peis.Domain/GuideTypes/GuideTypeManager.cs

@@ -66,7 +66,28 @@ namespace Shentun.Peis.GuidTypes
             }
             
         }
-        
-        
+
+
+        /// <summary>
+        /// 修改排序  相邻之间
+        /// </summary>
+        /// <param name="id">需要修改的ID</param>
+        /// <param name="targetid">目标ID</param>
+        public async Task UpdateSortAsync(Guid id, Guid targetid)
+        {
+            await EntityHelper.UpdateSort(_repository, id, targetid);
+        }
+
+        /// <summary>
+        /// 修改排序  置顶，置底
+        /// </summary>
+        /// <param name="id">需要修改的ID</param>
+        /// <param name="SortType">修改方式：1 置顶   2 置底</param>
+        /// <returns></returns>
+        public async Task UpdateManySortAsync(Guid id, int SortType)
+        {
+            await EntityHelper.UpdateManySortAsync(_repository, id, SortType);
+        }
+
     }
 }

src/Shentun.Peis.Domain/MedicalReportTypes/MedicalReportTypeManager.cs

@@ -63,6 +63,29 @@ namespace Shentun.Peis.MedicalReportTypes
             }
 
         }
-       
+
+
+
+        /// <summary>
+        /// 修改排序  相邻之间
+        /// </summary>
+        /// <param name="id">需要修改的ID</param>
+        /// <param name="targetid">目标ID</param>
+        public async Task UpdateSortAsync(Guid id, Guid targetid)
+        {
+            await EntityHelper.UpdateSort(_repository, id, targetid);
+        }
+
+        /// <summary>
+        /// 修改排序  置顶，置底
+        /// </summary>
+        /// <param name="id">需要修改的ID</param>
+        /// <param name="SortType">修改方式：1 置顶   2 置底</param>
+        /// <returns></returns>
+        public async Task UpdateManySortAsync(Guid id, int SortType)
+        {
+            await EntityHelper.UpdateManySortAsync(_repository, id, SortType);
+        }
+
     }
 }