Browse Source

may screen

田爽 1 year ago
parent
commit
c6de42f1bb

+ 32 - 8
src/Hotline.Api/Controllers/OrderController.cs

@@ -689,16 +689,40 @@ public class OrderController : BaseController
         return _timeLimitDomainService.CalcEndTime(dto.BeginTime, dto.DelayUnit, dto.DelayNum, false);
     }
 
-    #endregion
+	#endregion
+
+	#region 工单甄别
+
+	/// <summary>
+	/// 工单待甄别列表
+	/// </summary>
+	/// <param name="dto"></param>
+	/// <returns></returns>
+	[Permission(EPermission.MayOrderScreenList)]
+	[HttpGet("mayscreen")]
+	public async Task<PagedDto<OrderVisitDto>> ScreenList([FromQuery] PagedKeywordRequest dto)
+	{
+		var (total, items) = await _orderVisitRepository.Queryable()
+			.Includes(x => x.Order)
+			.Includes(x => x.Employee)
+			.Includes(x => x.OrderVisitDetails)
+			.WhereIF(!string.IsNullOrEmpty(dto.Keyword), d => d.Order.Title.Contains(dto.Keyword!) || d.Order.No.Contains(dto.Keyword!))
+            .Where(ov=>ov.OrderVisitDetails.Any(d=> 
+            (d.OrgProcessingResults != null && (SqlFunc.JsonField(d.OrgProcessingResults,"Name")  =="不满意" || SqlFunc.JsonField(d.OrgProcessingResults, "Name") == "非常不满意")) ||
+            (d.OrgHandledAttitude != null && (SqlFunc.JsonField(d.OrgHandledAttitude, "Name") == "不满意" || SqlFunc.JsonField(d.OrgHandledAttitude, "Name") == "非常不满意"))
+			))
+			.OrderBy(x => x.CreationTime)
+			.ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);
+		return new PagedDto<OrderVisitDto>(total, _mapper.Map<IReadOnlyList<OrderVisitDto>>(items));
+	}
 
-    #region 工单甄别
 
-    /// <summary>
-    /// 工单甄别列表
-    /// </summary>
-    /// <param name="dto"></param>
-    /// <returns></returns>
-    [Permission(EPermission.OrderScreenList)]
+	/// <summary>
+	/// 工单甄别列表
+	/// </summary>
+	/// <param name="dto"></param>
+	/// <returns></returns>
+	[Permission(EPermission.OrderScreenList)]
     [HttpGet("screen")]
     public async Task<PagedDto<OrderScreen>> ScreenList([FromQuery] ScreenListDto dto)
     {

+ 9 - 3
src/Hotline/Permissions/EPermission.cs

@@ -1073,9 +1073,15 @@ namespace Hotline.Permissions
 
 		#region 工单甄别管理
 
-        /// <summary>
-        /// 工单甄别列表
-        /// </summary>
+		/// <summary>
+		/// 工单甄别列表
+		/// </summary>
+		[Display(GroupName = "OrderScreen", Name = "工单待甄别列表", Description = "工单待甄别列表")]
+		MayOrderScreenList = 500803,
+
+		/// <summary>
+		/// 工单甄别列表
+		/// </summary>
 		[Display(GroupName = "OrderScreen", Name = "工单甄别列表", Description = "工单甄别列表")]
 		OrderScreenList = 500801,