统计

src/Hotline.Api/Controllers/Bi/BiOrderController.cs

@@ -1561,14 +1561,15 @@ namespace Hotline.Api.Controllers.Bi
 		/// <param name="dto"></param>
 		/// <returns></returns>
 		[HttpGet("reTransact")]
-		public async Task<PagedDto<OrderReTransactVo>> OrderReTransact([FromQuery] ReportPagedRequest dto) 
+		public async Task<PagedDto<OrderReTransactVo>> OrderReTransact([FromQuery] QueryOrderReTransactRequest dto) 
         {
 			if (!dto.StartTime.HasValue || !dto.EndTime.HasValue)
 				throw UserFriendlyException.SameMessage("请选择时间!");
 
             var (total, items) = await _orderSpecialDetailRepository.Queryable()
                 .Includes(x=>x.OrderSpecial)
-                .Where(x => x.OrderSpecial.ESpecialType == ESpecialType.ReTransact)
+                .WhereIF(!string.IsNullOrEmpty(dto.OrgName), x => x.OrgName.Contains(dto.OrgName!))
+				.Where(x => x.OrderSpecial.ESpecialType == ESpecialType.ReTransact)
                 .Where(x => x.OrderSpecial.CreationTime >= dto.StartTime)
                 .Where(x => x.OrderSpecial.CreationTime <= dto.EndTime)
                 .GroupBy(x => new { x.OrgId, x.OrgName })
@@ -1595,8 +1596,10 @@ namespace Hotline.Api.Controllers.Bi
 			if (!dto.StartTime.HasValue || !dto.EndTime.HasValue)
 				throw UserFriendlyException.SameMessage("请选择时间!");
 			var (total, items) = await _orderSpecialDetailRepository.Queryable()
-				.Includes(x => x.OrderSpecial)
+				.Includes(x => x.OrderSpecial,s=>s.Order)
                 .WhereIF(!string.IsNullOrEmpty(dto.OrgName),x=>x.OrgName.Contains(dto.OrgName!))
+				.WhereIF(!string.IsNullOrEmpty(dto.ErrorName), x => x.ErrorName.Contains(dto.ErrorName!))
+				.WhereIF(!string.IsNullOrEmpty(dto.No), x => x.OrderSpecial!.Order!.No!.Contains(dto.No!))
 				.Where(x => x.OrderSpecial.ESpecialType == ESpecialType.ReTransact)
 				.Where(x => x.OrderSpecial.CreationTime >= dto.StartTime)
 				.Where(x => x.OrderSpecial.CreationTime <= dto.EndTime)

src/Hotline.Share/Requests/PagedKeywordRequest.cs

@@ -136,8 +136,18 @@ public record QueryOrderDelayDataListRequest:ReportPagedRequest
 	public string? OrgName { get; set; }
 }
 
+public record QueryOrderReTransactRequest : ReportPagedRequest
+{
+	public string? OrgName { get; set; }
+
+}
+
 public record QueryOrderReTransactDetailRequest : ReportPagedRequest
 {
 	public string? OrgName { get; set; }
 
+	public string? ErrorName { get; set; }
+
+	public string? No { get; set; }
+
 }