328 【发布待办】页面新增查询条件

src/Hotline.Api/Controllers/OrderController.cs

@@ -291,9 +291,10 @@ public class OrderController : BaseController
             .WhereIF(!string.IsNullOrEmpty(dto.No), d => d.No == dto.No)
             .WhereIF(dto.PubState == EPubState.Pub, d => d.Status >= EOrderStatus.Published)
             .WhereIF(dto.PubState == EPubState.NoPub, d => d.Status < EOrderStatus.Published)
-            //.WhereIF(!string.IsNullOrEmpty(dto.PubMan),
-            //    d => d.AcceptorName.Contains(dto.PubMan!) || d.AcceptorStaffNo.Contains(dto.PubMan!))
-            .WhereIF(dto.PubRange == EPublicState.Pub, d => d.OrderPublish.PublishState)
+            .WhereIF(!string.IsNullOrEmpty(dto.Channel), d => d.SourceChannelCode == dto.Channel)
+			//.WhereIF(!string.IsNullOrEmpty(dto.PubMan),
+			//    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.IsProvinceOrder.HasValue && dto.IsProvinceOrder == true, d => d.Source == ESource.ProvinceStraight)
             .WhereIF(dto.IsProvinceOrder.HasValue && dto.IsProvinceOrder == false, d => d.Source != ESource.ProvinceStraight)
@@ -794,16 +795,30 @@ public class OrderController : BaseController
         await _orderRepository.UpdateRangeAsync(orders, HttpContext.RequestAborted);
     }
 
-    #endregion
-
-    #region 工单回访
-
     /// <summary>
-    /// 回访列表
+    /// 列表页面基础数据
     /// </summary>
-    /// <param name="dto"></param>
     /// <returns></returns>
-    [HttpGet("visit")]
+    [HttpGet("publish/base-data")]
+    public async Task<object> PublishBaseData()
+    {
+	    var rsp = new
+	    {
+		    ChannelOptions = _sysDicDataCacheManager.GetSysDicDataCache(TimeLimitBaseDataConsts.SourceChannel)
+	    };
+	    return rsp;
+    }
+
+	#endregion
+
+	#region 工单回访
+
+	/// <summary>
+	/// 回访列表
+	/// </summary>
+	/// <param name="dto"></param>
+	/// <returns></returns>
+	[HttpGet("visit")]
     public async Task<PagedDto<OrderVisitDto>> QueryOrderVisitList([FromQuery] QueryOrderVisitDto dto)
     {
         var (total, items) = await _orderVisitRepository.Queryable()

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

@@ -65,4 +65,9 @@ public record QueryOrderPublishDto : PagedKeywordRequest
     /// 是否省工单（空为全部  true为省工单 false为市工单）
     /// </summary>
     public bool? IsProvinceOrder { get; set; }
+
+    /// <summary>
+    /// 来源渠道（√）
+    /// </summary>
+    public string? Channel { get; set; }
 }