工单终止

src/Hotline.Api/Controllers/OrderTerminateController.cs

@@ -104,7 +104,16 @@ namespace Hotline.Api.Controllers
 		[HttpGet]
 		public async Task<PagedDto<OrderTerminateEntityDto>> OrderTerminateList([FromQuery] OrderTerminateListDto dto)
 		{
-			var (total, items) = await _orderApplication.OrderTerminateList(dto)
+			var isAdmin = _orderDomainService.IsCheckAdmin();
+			var query = _orderTerminateRepository.Queryable(hasHandled: false, isAdmin: isAdmin)
+				.Includes(d => d.Order)
+				.WhereIF(!string.IsNullOrEmpty(dto.No), d => d.Order.No!.Contains(dto.No!))
+				.WhereIF(!string.IsNullOrEmpty(dto.Title), d => d.Order.Title!.Contains(dto.Title!))
+				.WhereIF(dto.ApplyStartTime.HasValue && dto.ApplyEndTime.HasValue,
+					d => d.CreationTime >= dto.ApplyStartTime && d.CreationTime <= dto.ApplyEndTime)
+				.WhereIF(dto.StartTime.HasValue && dto.EndTime.HasValue, d => d.Order.StartTime >= dto.StartTime && d.Order.StartTime <= dto.EndTime)
+				.OrderByDescending(d => d.CreationTime);
+			var (total, items) = await query
 				.ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);
 			return new PagedDto<OrderTerminateEntityDto>(total, _mapper.Map<IReadOnlyList<OrderTerminateEntityDto>>(items));
 		}
@@ -118,7 +127,15 @@ namespace Hotline.Api.Controllers
 		[HttpPost("export")]
 		public async Task<FileStreamResult> OrderTerminateListExport([FromBody] ExportExcelDto<OrderTerminateListDto> dto)
 		{
-			var query = _orderApplication.OrderTerminateList(dto.QueryDto);
+			var isAdmin = _orderDomainService.IsCheckAdmin();
+			var query = _orderTerminateRepository.Queryable(hasHandled: false, isAdmin: isAdmin)
+				.Includes(d => d.Order)
+				.WhereIF(!string.IsNullOrEmpty(dto.QueryDto.No), d => d.Order.No!.Contains(dto.QueryDto.No!))
+				.WhereIF(!string.IsNullOrEmpty(dto.QueryDto.Title), d => d.Order.Title!.Contains(dto.QueryDto.Title!))
+				.WhereIF(dto.QueryDto.ApplyStartTime.HasValue && dto.QueryDto.ApplyEndTime.HasValue,
+					d => d.CreationTime >= dto.QueryDto.ApplyStartTime && d.CreationTime <= dto.QueryDto.ApplyEndTime)
+				.WhereIF(dto.QueryDto.StartTime.HasValue && dto.QueryDto.EndTime.HasValue, d => d.Order.StartTime >= dto.QueryDto.StartTime && d.Order.StartTime <= dto.QueryDto.EndTime)
+				.OrderByDescending(d => d.CreationTime);
 			List<OrderTerminate> data;
 			if (dto.IsExportAll)
 			{

src/Hotline.Application/Orders/IOrderApplication.cs

@@ -307,12 +307,6 @@ namespace Hotline.Application.Orders
         ISugarQueryable<OrderObserve> OrderObserveList(OrderObserveListDto dto);
 
 
-        /// <summary>
-        /// 终止列表查询
-        /// </summary>
-        /// <param name="dto"></param>
-        /// <returns></returns>
-        ISugarQueryable<OrderTerminate> OrderTerminateList(OrderTerminateListDto dto);
 
 	}
 }

src/Hotline.Application/Orders/OrderApplication.cs

@@ -103,7 +103,6 @@ public class OrderApplication : IOrderApplication, IScopeDependency
     private readonly IRepository<OrderScreen> _orderScreenRepository;
     private readonly IRepository<OrderSendBackAudit> _orderSendBackAuditRepository;
     private readonly ICalcExpireTime _expireTime;
-    private readonly IOrderTerminateRepository _orderTerminateRepository;
     private readonly IRepository<OrderObserve> _orderObserveRepository;
 
 
@@ -140,7 +139,6 @@ public class OrderApplication : IOrderApplication, IScopeDependency
         ISystemDicDataCacheManager sysDicDataCacheManager,
         Publisher publisher,
         IRepository<TranspondCityRawData> transpondCityRawDataRepository,
-        IOrderTerminateRepository orderTerminateRepository,
         IRepository<OrderObserve> orderObserveRepository)
     {
         _orderDomainService = orderDomainService;
@@ -175,7 +173,6 @@ public class OrderApplication : IOrderApplication, IScopeDependency
         _sysDicDataCacheManager = sysDicDataCacheManager;
         _publisher = publisher;
         _transpondCityRawDataRepository = transpondCityRawDataRepository;
-        _orderTerminateRepository = orderTerminateRepository;
         _orderObserveRepository = orderObserveRepository;
 
 	}
@@ -2118,25 +2115,6 @@ public class OrderApplication : IOrderApplication, IScopeDependency
         return query;
     }
 
-	/// <summary>
-	/// 终止列表查询
-	/// </summary>
-	/// <param name="dto"></param>
-	/// <returns></returns>
-
-	public ISugarQueryable<OrderTerminate> OrderTerminateList(OrderTerminateListDto dto) {
-		var isAdmin = _orderDomainService.IsCheckAdmin();
-		var query = _orderTerminateRepository.Queryable(hasHandled: false, isAdmin: isAdmin)
-            .Includes(d => d.Order)
-            .WhereIF(!string.IsNullOrEmpty(dto.No), d => d.Order.No!.Contains(dto.No!))
-            .WhereIF(!string.IsNullOrEmpty(dto.Title), d => d.Order.Title!.Contains(dto.Title!))
-            .WhereIF(dto.ApplyStartTime.HasValue && dto.ApplyEndTime.HasValue,
-                d => d.CreationTime >= dto.ApplyStartTime && d.CreationTime <= dto.ApplyEndTime)
-            .WhereIF(dto.StartTime.HasValue && dto.EndTime.HasValue, d => d.Order.StartTime >= dto.StartTime && d.Order.StartTime <= dto.EndTime)
-            .OrderByDescending(d => d.CreationTime);
-		return query;
-	}
-
 
 
 	#region private