Merge branch 'test' of http://110.188.24.182:10023/Fengwo/hotline into test

src/Hotline.Api/Controllers/OrderApi/OrderComplementController.cs

@@ -182,7 +182,7 @@ public class OrderComplementController : BaseController
             OrderId = data.OrderId,
             Opinion = data.Opinion,
             SupplyName = data.SupplyName,
-            SupplyOrg = data.SupplyOrg,
+            SupplyOrg = !string.IsNullOrEmpty(data.SupplyOrg) ? data.SupplyOrg : data.CreatorOrgName,
             SupplyTime = data.SupplyTime,
             DsBisId = data.DsBisId,
             No = data.No,
@@ -230,6 +230,35 @@ 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.Queryable()
+            .Includes(p => p.Order)
+            .Where(p => p.Id == id)
+            .FirstAsync();
+        if (data == null)
+            throw UserFriendlyException.SameMessage("补充查询失败！");
+
+        ComplementOrderDto orderDto = new()
+        {
+            Id = id,
+            OrderId = data.OrderId,
+            Opinion = data.Opinion,
+            SupplyName = data.SupplyName,
+            SupplyOrg = !string.IsNullOrEmpty(data.SupplyOrg) ? data.SupplyOrg : data.CreatorOrgName, 
+            SupplyTime = data.SupplyTime,
+            No = data.No,
+            Title = data.Order?.Title
+        };
+        return orderDto;
+    }
+
     /// <summary>
     /// 补充查询
     /// </summary>
@@ -343,7 +372,8 @@ public class OrderComplementController : BaseController
             detailDto.No = data.No;
             detailDto.OrderTitle = data.Order.Title;
             detailDto.UserName = data.SupplyName;
-            detailDto.OrgName = data.CreatorOrgName;
+            detailDto.OrgName = data.SupplyOrg;
+            detailDto.SupplyTime = data.SupplyTime;
             detailDto.Opinion = data.Opinion;
             detailDto.OperationName = data.CreatorName;
             detailDto.OperationTime = data.CreationTime;

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>
@@ -30,6 +35,8 @@
         /// 工单编号
         /// </summary>
         public string? No { get; set; }
+
+        public string? Title { get; set; }
     }
 
     public class ComplementOrderCopDto : ComplementOrderDto
@@ -37,6 +44,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

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);
 
         }
     }