Pārlūkot izejas kodu

新增补充查询接口

tangjiang 1 nedēļu atpakaļ
vecāks
revīzija
817639ad40

+ 15 - 0
src/Hotline.Api/Controllers/OrderApi/OrderComplementController.cs

@@ -230,6 +230,21 @@ public class OrderComplementController : BaseController
         await _orderComplementRepository.RemoveAsync(p => p.Id == id, false, HttpContext.RequestAborted);
     }
 
+    /// <summary>
+    /// 查询补充详情
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    [HttpGet("get_complement_order_info/{id}")]
+    public async Task<ComplementOrderDto> GetComplementOrderInfo(string id)
+    {
+        var data = await _orderComplementRepository.GetAsync(p => p.Id == id, cancellationToken: HttpContext.RequestAborted);
+        if (data == null)
+            throw UserFriendlyException.SameMessage("补充查询失败!");
+
+        return _mapper.Map<ComplementOrderDto>(data);
+    }
+
     /// <summary>
     /// 补充查询
     /// </summary>

+ 15 - 0
src/Hotline.Share/Dtos/Order/ComplementOrderDto.cs

@@ -21,6 +21,11 @@
         /// </summary>
         public string? SupplyName { get; set; }
 
+        /// <summary>
+        /// 补充部门
+        /// </summary>
+        public string? SupplyOrg { get; set; }
+
         /// <summary>
         /// 补充时间
         /// </summary>
@@ -37,6 +42,16 @@
         public string? OperationType { get; set; }
 
         public string? OperationTypeName => OperationType == "0" ? "编辑" : OperationType == "1" ? "删除" : "";
+
+        /// <summary>
+        /// 操作时间
+        /// </summary>
+        public DateTime? CreationTime {  get; set; }
+
+        /// <summary>
+        /// 操作人
+        /// </summary>
+        public string? CreatorName {  get; set; }
     }
 
     public class ComplementOrderCopyDetailDto

+ 6 - 2
src/Hotline/Orders/ComplementOrderService.cs

@@ -37,7 +37,9 @@ namespace Hotline.Orders
                   .WhereIF(!string.IsNullOrEmpty(dto.SupplyName), p => p.SupplyName == dto.SupplyName)
                   .WhereIF(dto.StartTime.HasValue, p => p.SupplyTime >= dto.StartTime)
                   .WhereIF(dto.EndTime.HasValue, p => p.SupplyTime <= dto.EndTime)
-                  .OrderByDescending(p => p.SupplyTime);
+                   .OrderByIF(dto is { SortField: "supplyTime", SortRule: 0 }, d => d.SupplyTime, OrderByType.Asc) //受理时间升序
+                  .OrderByIF(dto is { SortField: "supplyTime", SortRule: 1 }, d => d.SupplyTime, OrderByType.Desc) //受理时间降序
+                  .OrderByIF(string.IsNullOrEmpty(dto.SortField), p => p.SupplyTime, OrderByType.Desc);
 
         }
 
@@ -58,7 +60,9 @@ namespace Hotline.Orders
                   .WhereIF(dto.StartTime.HasValue, p => p.CreationTime >= dto.StartTime)
                   .WhereIF(dto.EndTime.HasValue, p => p.CreationTime <= dto.EndTime)
                   .WhereIF(!string.IsNullOrEmpty(dto.OperationType), p => p.OperationType == dto.OperationType)
-                  .OrderByDescending(p => p.CreationTime);
+                  .OrderByIF(dto is { SortField: "creationTime", SortRule: 0 }, d => d.CreationTime, OrderByType.Asc) //受理时间升序
+                  .OrderByIF(dto is { SortField: "creationTime", SortRule: 1 }, d => d.CreationTime, OrderByType.Desc) //受理时间降序
+                  .OrderByIF(string.IsNullOrEmpty(dto.SortField), p => p.CreationTime, OrderByType.Desc);
 
         }
     }