瀏覽代碼

Merge branch 'master' of http://git.12345lm.cn/Fengwo/hotline

TANG JIANG 1 年之前
父節點
當前提交
a7a533b776

+ 21 - 1
src/Hotline.Api/Controllers/Bi/BiOrderController.cs

@@ -1799,5 +1799,25 @@ namespace Hotline.Api.Controllers.Bi
             return rsp;
         }
 
-    }
+        /// <summary>
+        /// 派单量统计// TODO
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        public async Task<PagedDto<BiOrderSendVo>> SendOrderReport([FromQuery] QuerySendOrderRequest dto) 
+        {
+	        if (!dto.StartTime.HasValue || !dto.EndTime.HasValue)
+		        throw UserFriendlyException.SameMessage("请选择时间!");
+	        var (total, items) = await _orderSpecialDetailRepository.Queryable()
+		        .Includes(x => x.OrderSpecial, s => s.Order)
+		        .WhereIF(!string.IsNullOrEmpty(dto.UserName), x => x.OrgName.Contains(dto.UserName!))
+		        .Where(x => x.OrderSpecial.ESpecialType == ESpecialType.ReTransact)
+		        .Where(x => x.OrderSpecial.CreationTime >= dto.StartTime)
+		        .Where(x => x.OrderSpecial.CreationTime <= dto.EndTime)
+		        .ToPagedListAsync(dto, HttpContext.RequestAborted);
+            return new PagedDto<BiOrderSendVo>(total, _mapper.Map<IReadOnlyList<BiOrderSendVo>>(items)); ;
+		}
+
+
+	}
 }

+ 11 - 2
src/Hotline.Share/Dtos/Order/OrderBiDto.cs

@@ -452,8 +452,17 @@ namespace Hotline.Share.Dtos.Order
         }
     }
 
-	public class BiOrderSendDto { 
-	
+	public class BiOrderSendVo
+	{
+		public string UserName { get; set; }
+
+		public int SendOrderNum { get; set; }
+
+		public int NoSendOrderNum { get; set; }
+
+		public int ReSendOrderNum { get; set; }
+
+		public string AccuracyRate { get; set; }
 	}
 
 	public class OrderReTransactVo

+ 6 - 0
src/Hotline.Share/Requests/PagedKeywordRequest.cs

@@ -150,4 +150,10 @@ public record QueryOrderReTransactDetailRequest : ReportPagedRequest
 
 	public string? No { get; set; }
 
+}
+
+public record QuerySendOrderRequest : ReportPagedRequest
+{
+	public string? UserName { get; set; }
+
 }