Merge branch 'master' of http://110.188.24.182:10023/Fengwo/hotline

src/Hotline.Api/Controllers/OrderController.cs

@@ -582,6 +582,10 @@ public class OrderController : BaseController
                 x => x.VisitState == Share.Enums.Order.EVisitState.Visited)
             .WhereIF(!string.IsNullOrEmpty(dto.Keyword),
                 x => x.Order.Title.Contains(dto.Keyword!) || x.Order.No.Contains(dto.Keyword!))
+            .WhereIF(dto.FiledType != null && dto.FiledType == FiledType.CenterFiled, d => d.Order.ProcessType == EProcessType.Zhiban)
+            .WhereIF(dto.FiledType != null && dto.FiledType == FiledType.OrgFiled, d => d.Order.ProcessType == EProcessType.Jiaoban)
+            .WhereIF(dto.IsCountersign != null && dto.IsCountersign == true, d => d.Order.CounterSignType != null)
+            .WhereIF(dto.IsCountersign != null && dto.IsCountersign == false, d => d.Order.CounterSignType == null)
             .OrderByDescending(x => x.PublishTime)
             .ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);
         return new PagedDto<OrderVisitDto>(total, _mapper.Map<IReadOnlyList<OrderVisitDto>>(items));
@@ -1235,12 +1239,12 @@ public class OrderController : BaseController
     {
         var isHandled = dto.IsApply.HasValue && dto.IsApply.Value;
         var (total, items) = await _orderDelayRepository
-            .Queryable(viewFilter: true, handlerFilter: isHandled)
+            .Queryable(viewFilter: true, handlerFilter: !isHandled)
             .Includes(x => x.Order)
             .WhereIF(!string.IsNullOrEmpty(dto.Keyword),
                 d => d.Order.Title.Contains(dto.Keyword!) || d.No.Contains(dto.Keyword!))
-            .WhereIF(dto.IsApply == true, x => x.DelayState != EDelayState.Examining)
-            .WhereIF(dto.IsApply == false, x => x.DelayState == EDelayState.Examining)
+            //.WhereIF(dto.IsApply == true, x => x.DelayState != EDelayState.Examining)
+            //.WhereIF(dto.IsApply == false, x => x.DelayState == EDelayState.Examining)
             .WhereIF(dto.DelayState != null, x => x.DelayState == dto.DelayState)
             .OrderByDescending(x => x.ApplyDelayTime)
             .ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);

src/Hotline.Share/Dtos/Order/OrderVisitDto.cs

@@ -18,6 +18,16 @@ namespace Hotline.Share.Dtos.Order
     public record QueryOrderVisitDto : PagedKeywordRequest
     {
         public EVisitStateQuery VisitState { get; set; }
+
+        /// <summary>
+        /// 归档方式
+        /// </summary>
+        public FiledType? FiledType { get; set; }
+
+        /// <summary>
+        /// 是否会签
+        /// </summary>
+        public bool? IsCountersign { get; set; }
     }
 
     public record VisitDetailListDto : PagedKeywordRequest

src/Hotline.Share/Dtos/Order/QueryOrderDto.cs

@@ -92,10 +92,7 @@ namespace Hotline.Share.Dtos.Order
         /// </summary>
         public EPubState? PubState { get; set; }
 
-        /// <summary>
-        /// 归档方式
-        /// </summary>
-        public FiledType? FiledType { get; set; }
+        
 
         /// <summary>
         /// 工单标题
@@ -134,6 +131,11 @@ namespace Hotline.Share.Dtos.Order
         public DateTime? FiledTimeStart { get; set; }
         public DateTime? FiledTimeEnd { get; set; }
 
+        /// <summary>
+        /// 归档方式
+        /// </summary>
+        public FiledType? FiledType { get; set; }
+
         /// <summary>
         /// 是否会签
         /// </summary>