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

src/Hotline.Api/Controllers/OrderController.cs

@@ -2148,9 +2148,7 @@ public class OrderController : BaseController
         var ids = dto.OrderIds.Select(x=>x.OrderId).ToList();
         var list = await _orderObserveRepository.Queryable().In(x => x.OrderId, ids).Select(x=> new OrdersObserveAddDto { OrderId = x.OrderId }).ToListAsync();
         if (list.Any())
-        {
-	        dto.OrderIds = dto.OrderIds.Except(list).ToList();
-        }
+            dto.OrderIds = dto.OrderIds.Except(list).ToList();
         if (!dto.OrderIds.Any())
 	        throw UserFriendlyException.SameMessage("无效工单观察,当前所选工单都已观察");
 		var observe = _mapper.Map<List<OrderObserve>>(dto.OrderIds);
@@ -2197,8 +2195,9 @@ public class OrderController : BaseController
         var (total, items) = await _orderObserveRepository.Queryable()
             .Includes(x => x.Order)
             .WhereIF(dto.IsProvince.HasValue, x => x.Order.IsProvince == dto.IsProvince)
-            .WhereIF(!string.IsNullOrEmpty(dto.Title), x => x.Order.Title.Contains(dto.Title!))
-            .WhereIF(!string.IsNullOrEmpty(dto.No), x => x.Order.No.Contains(dto.No!))
+            .WhereIF(!string.IsNullOrEmpty(dto.Keyword), x => x.Order.No.Contains(dto.No!) || x.Order.Title.Contains(dto.Title!))
+            //.WhereIF(!string.IsNullOrEmpty(dto.Title), x => x.Order.Title.Contains(dto.Title!))
+            //.WhereIF(!string.IsNullOrEmpty(dto.No), x => x.Order.No.Contains(dto.No!))
             .OrderByDescending(x => x.CreationTime)
             .ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);
         return new PagedDto<OrderObserveDto>(total, _mapper.Map<IReadOnlyList<OrderObserveDto>>(items));
@@ -2230,9 +2229,7 @@ public class OrderController : BaseController
 		var ids = dto.OrderIds.Select(x => x.OrderId).ToList();
 		var list = await _orderFinalityRepository.Queryable().In(x => x.OrderId, ids).Select(x => new OrdersFinalityAddDto { OrderId = x.OrderId }).ToListAsync();
 		if (list.Any())
-		{
 			dto.OrderIds = dto.OrderIds.Except(list).ToList();
-		}
 		if (!dto.OrderIds.Any())
 			throw UserFriendlyException.SameMessage("无效工单终结,当前所选工单都已终结");
 		var observe = _mapper.Map<List<OrderFinality>>(dto.OrderIds);
@@ -2267,24 +2264,25 @@ public class OrderController : BaseController
         await _orderFinalityRepository.UpdateAsync(word, HttpContext.RequestAborted);
     }
 
-    /// <summary>
-    /// 获取工单终结列表
-    /// </summary>
-    /// <param name="dto"></param>
-    /// <returns></returns>
-    [Permission(EPermission.OrderFinalityList)]
-    [HttpGet("order_finality/list")]
-    public async Task<PagedDto<OrderFinalityDto>> List([FromQuery] OrderFinalityListDto dto)
-    {
-        var (total, items) = await _orderFinalityRepository.Queryable()
-            .Includes(x => x.Order)
-            .WhereIF(dto.IsProvince.HasValue, x => x.Order.IsProvince == dto.IsProvince)
-            .WhereIF(!string.IsNullOrEmpty(dto.Title), x => x.Order.Title.Contains(dto.Title!))
-            .WhereIF(!string.IsNullOrEmpty(dto.No), x => x.Order.No.Contains(dto.No!))
-            .OrderByDescending(x => x.CreationTime)
-            .ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);
-        return new PagedDto<OrderFinalityDto>(total, _mapper.Map<IReadOnlyList<OrderFinalityDto>>(items));
-    }
+	/// <summary>
+	/// 获取工单终结列表
+	/// </summary>
+	/// <param name="dto"></param>
+	/// <returns></returns>
+	[Permission(EPermission.OrderFinalityList)]
+	[HttpGet("order_finality/list")]
+	public async Task<PagedDto<OrderFinalityDto>> List([FromQuery] OrderFinalityListDto dto)
+	{
+		var (total, items) = await _orderFinalityRepository.Queryable()
+			.Includes(x => x.Order)
+			.WhereIF(dto.IsProvince.HasValue, x => x.Order.IsProvince == dto.IsProvince)
+			.WhereIF(!string.IsNullOrEmpty(dto.Keyword), x => x.Order.No.Contains(dto.No!) || x.Order.Title.Contains(dto.Title!))
+			//.WhereIF(!string.IsNullOrEmpty(dto.Title), x => x.Order.Title.Contains(dto.Title!))
+			//.WhereIF(!string.IsNullOrEmpty(dto.No), x => x.Order.No.Contains(dto.No!))
+			.OrderByDescending(x => x.CreationTime)
+			.ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);
+		return new PagedDto<OrderFinalityDto>(total, _mapper.Map<IReadOnlyList<OrderFinalityDto>>(items));
+	}
 
     /// <summary>
     /// 获取工单终结