Merge branch 'cd324、327' into dev

src/Hotline.Api/Controllers/OrderController.cs

@@ -288,7 +288,9 @@ public class OrderController : BaseController
             //    d => d.AcceptorName.Contains(dto.PubMan!) || d.AcceptorStaffNo.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.IsProvinceOrder.HasValue && dto.IsProvinceOrder == true, d => d.Source == ESource.ProvinceStraight)
+            .WhereIF(dto.IsProvinceOrder.HasValue && dto.IsProvinceOrder == false, d => d.Source != ESource.ProvinceStraight)
+			.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)

src/Hotline.Share/Dtos/Order/Publish/QueryOrderPublishDto.cs

@@ -60,4 +60,9 @@ public record QueryOrderPublishDto : PagedKeywordRequest
     /// 是否只查询自己的待发布工单
     /// </summary>
     public bool? QuerySelf { get; set; }
+
+    /// <summary>
+    /// 是否省工单（空为全部  true为省工单 false为市工单）
+    /// </summary>
+    public bool? IsProvinceOrder { get; set; }
 }