Merge branch 'test' of http://110.188.24.182:10023/Fengwo/hotline into test

src/Hotline.Api/Controllers/KnowledgeController.cs

@@ -458,14 +458,33 @@ namespace Hotline.Api.Controllers
             }).ToList();
             await _knowledgeRepository.Updateable(kns)
                 .UpdateColumns(d => d.IsPublic)
-                .ExecuteCommandAsync(HttpContext.RequestAborted);
-        }
-
-        /// <summary>
-        /// 批量审核
-        /// </summary>
-        /// <returns></returns>
-        [HttpPost("batch_audit")]
+                .Where(d => d.Status == EKnowledgeStatus.OnShelf)
+				.ExecuteCommandAsync(HttpContext.RequestAborted);
+        }
+
+		/// <summary>
+		/// 批量下架
+		/// </summary>
+		/// <returns></returns>
+		[HttpPost("unshelve-batch")]
+		public async Task UnshelveBatch([FromBody] UnshelveBatchRequest request)
+		{
+			var kns = request.KnowledgeIds.Select(d => new Knowledge
+			{
+				Id = d,
+				Status = EKnowledgeStatus.OffShelf
+			}).ToList();
+			await _knowledgeRepository.Updateable(kns)
+				.UpdateColumns(d => d.Status)
+				.ExecuteCommandAsync(HttpContext.RequestAborted);
+		}
+
+
+		/// <summary>
+		/// 批量审核
+		/// </summary>
+		/// <returns></returns>
+		[HttpPost("batch_audit")]
         public async Task<string> KnowledgeBatchAuditAsync([FromBody] KnowledgeBatchAuditInDto dto)
         {
             var result = new StringBuilder();

src/Hotline.Application/Orders/OrderApplication.cs

@@ -802,11 +802,12 @@ public class OrderApplication : IOrderApplication, IScopeDependency
             .WhereIF(!string.IsNullOrEmpty(dto.Hotspot), d => d.HotspotSpliceName != null && d.HotspotSpliceName.Contains(dto.Hotspot))
             .WhereIF(!string.IsNullOrEmpty(dto.OrgLevelOneName), d => d.OrgLevelOneName.Contains(dto.OrgLevelOneName)) //一级部门
             .WhereIF(!string.IsNullOrEmpty(dto.FromPhone), d => d.FromPhone == dto.FromPhone) //来电号码
-                                                                                              //.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.IsProvince == true)
+			.WhereIF(!string.IsNullOrEmpty(dto.Contact), d => d.Contact == dto.Contact) //联系电话
+																								//.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.IsProvince == true)
             .WhereIF(dto.IsProvinceOrder.HasValue && dto.IsProvinceOrder == false, d => d.IsProvince == false)
             //.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)

src/Hotline.Share/Dtos/Knowledge/PublishBatchRequest.cs

@@ -8,4 +8,13 @@ public record PublishBatchRequest
     public List<string> KnowledgeIds { get; set; }
 
     public bool IsPublic { get; set; }
+}
+
+/// <summary>
+/// 批量下架
+/// </summary>
+public record UnshelveBatchRequest
+{
+	public List<string> KnowledgeIds { get; set; }
+
 }

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

@@ -41,10 +41,15 @@ public record QueryOrderPublishDto : PagedKeywordRequest
     /// </summary>
     public string? FromPhone { get; set; }
 
-    /// <summary>
-    /// 接办名称（综合查询使用）
-    /// </summary>
-    public string? ActualHandleOrgName { get; set; }
+	/// <summary>
+	/// 联系电话
+	/// </summary>
+	public string? Contact { get; set; }
+
+	/// <summary>
+	/// 接办名称（综合查询使用）
+	/// </summary>
+	public string? ActualHandleOrgName { get; set; }
 
     /// <summary>
     /// 受理类型