orderpublish

src/Hotline.Api/Controllers/OrderController.cs

@@ -212,6 +212,10 @@ public class OrderController : BaseController
                 d => d.Acceptor.Name.Contains(dto.PubMan!) || d.Acceptor.StaffNo.Contains(dto.PubMan!))
             .WhereIF(dto.PubRange == EPublicState.Pub, d => d.OrderPublish.PublishState)
             .WhereIF(dto.PubRange == EPublicState.NoPub, d => !d.OrderPublish.PublishState)
+            .WhereIF(dto.FiledType!=null && dto.FiledType == FiledType.CenterFiled,d=>d.ProcessType == EProcessType.Zhiban)
+            .WhereIF(dto.FiledType!=null && dto.FiledType == FiledType.OrgFiled,d=>d.ProcessType == EProcessType.Jiaoban)
+            .WhereIF(dto.IsCountersign!=null && dto.IsCountersign == true,d=>d.CounterSignType != null)
+            .WhereIF(dto.IsCountersign!=null && dto.IsCountersign == false,d=>d.CounterSignType == null)
             .WhereIF(dto.AcceptTypes.Any(), d => dto.AcceptTypes.Contains(d.AcceptType))
             .WhereIF(dto.HotspotIds.Any(), d => dto.HotspotIds.Contains(d.HotspotId))
             .WhereIF(dto.CreationTimeStart.HasValue, d => d.CreationTime >= dto.CreationTimeStart)
@@ -224,7 +228,6 @@ public class OrderController : BaseController
         return new PagedDto<PublishDto>(total, _mapper.Map<IReadOnlyList<PublishDto>>(items));
     }
 
-
     /// <summary>
     /// 批量发布工单
     /// </summary>
@@ -314,7 +317,6 @@ public class OrderController : BaseController
         }
     }
 
-
     /// <summary>
     /// 发布工单
     /// </summary>
@@ -406,10 +408,6 @@ public class OrderController : BaseController
         await _orderVisitedDetailRepository.AddRangeAsync(visitedDetail, HttpContext.RequestAborted);
     }
 
-
-    
-
-
     /// <summary>
     /// 发布页面基础信息
     /// </summary>

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

@@ -92,6 +92,11 @@ namespace Hotline.Share.Dtos.Order
         /// </summary>
         public EPubState? PubState { get; set; }
 
+        /// <summary>
+        /// 归档方式
+        /// </summary>
+        public FiledType? FiledType { get; set; }
+
         /// <summary>
         /// 工单标题
         /// </summary>
@@ -129,9 +134,21 @@ namespace Hotline.Share.Dtos.Order
         public DateTime? FiledTimeStart { get; set; }
         public DateTime? FiledTimeEnd { get; set; }
 
+        /// <summary>
+        /// 是否会签
+        /// </summary>
+        public bool? IsCountersign { get; set; }
+
     }
 
-    
+    public enum FiledType 
+    {
+        [Description("中心归档")]
+        CenterFiled = 10,
+
+        [Description("部门归档")]
+        OrgFiled = 20,
+    }
 
     public record QueryOrderRedoRecordDto: PagedKeywordRequest
     {