Переглянути джерело

自贡任务 447 特提列表增加“申请人”查询条件

tangjiang 1 місяць тому
батько
коміт
21496ebccb

+ 2 - 1
src/Hotline.Api/Controllers/OrderController.cs

@@ -2990,7 +2990,7 @@ public class OrderController : BaseController
     {
         var model = await _orderScreenRepository.Queryable(canView: false)
             .Includes(x => x.Order)
-            .Includes(x=>x.VisitDetail)
+            .Includes(x => x.VisitDetail)
             .Includes(x => x.Workflow, d => d.Steps)
             .Includes(x => x.Visit, d => d.Order)
             .FirstAsync(x => x.Id == id);
@@ -7445,6 +7445,7 @@ public class OrderController : BaseController
             .WhereIF(pagedDto.EndTime.HasValue, (x, p) => p.CreationTime <= pagedDto.EndTime)
             .WhereIF(!string.IsNullOrEmpty(pagedDto.No), (x, p) => x.No.Contains(pagedDto.No))
             .WhereIF(pagedDto.State.HasValue, (x, p) => p.State == pagedDto.State)
+           .WhereIF(!string.IsNullOrEmpty(pagedDto.CreatorName), (x, p) => p.CreatorName.Contains(pagedDto.CreatorName))
             .Select((x, p) => new
             {
                 index = SqlFunc.RowNumber($"{p.CreationTime} desc ", $"{p.OrderId}"),

+ 5 - 0
src/Hotline.Share/Dtos/Order/OrderSpecialDto.cs

@@ -346,6 +346,11 @@ namespace Hotline.Share.Dtos.Order
 		/// 工单编号
 		/// </summary>
         public string? No { get; set; }
+
+        /// <summary>
+        /// 特提申请人
+        /// </summary>
+        public string? CreatorName { get;set; }
     }
 
     public class SpecialOrderListDto