回退错件

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

@@ -2209,10 +2209,6 @@ namespace Hotline.Api.Controllers.Bi
         [HttpGet("reTransact_detail")]
         public async Task<PagedDto<OrderSpecialDetailDto>> OrderReTransactDetail([FromQuery] QueryOrderReTransactDetailRequest dto)
         {
-            if (!dto.StartTime.HasValue || !dto.EndTime.HasValue)
-                throw UserFriendlyException.SameMessage("请选择时间!");
-            dto.EndTime = dto.EndTime.Value.AddDays(1).AddSeconds(-1);
-
             var query = _orderApplication.QueryOrderSourceDetail(dto);
             var (total, items) = await
                 query.ToPagedListAsync(dto, HttpContext.RequestAborted);

src/Hotline.Application/Orders/OrderApplication.cs

@@ -783,8 +783,10 @@ public class OrderApplication : IOrderApplication, IScopeDependency
     /// <returns></returns>
     public ISugarQueryable<OrderSpecialDetail> QueryOrderSourceDetail(QueryOrderReTransactDetailRequest dto)
     {
-
-        return _orderSpecialDetailRepository.Queryable()
+	    if (!dto.StartTime.HasValue || !dto.EndTime.HasValue)
+		    throw UserFriendlyException.SameMessage("请选择时间!");
+	    dto.EndTime = dto.EndTime.Value.AddDays(1).AddSeconds(-1);
+		return _orderSpecialDetailRepository.Queryable()
             .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!))

src/Hotline.Share/Enums/Order/ESendBackAuditState.cs

@@ -13,7 +13,7 @@ namespace Hotline.Share.Enums.Order
 		/// <summary>
 		/// 待办
 		/// </summary>
-		[Description("待办")]
+		[Description("待审批")]
 		Apply = 0,
 
 		/// <summary>