甄别

src/Hotline.Api/Controllers/OrderController.cs

@@ -792,6 +792,7 @@ public class OrderController : BaseController
         var (total, items) = await _orderScreenRepository.Queryable()
             .Includes(x => x.Visit)
             .Includes(x=>x.Order)
+            .Includes(x=>x.VisitDetail)
             .WhereIF(!string.IsNullOrEmpty(dto.Keyword), d => d.Order.Title.Contains(dto.Keyword!) || d.Order.No.Contains(dto.Keyword!))
             .WhereIF(dto.Status == EScreenStatus.Apply || dto.Status == EScreenStatus.Approval || dto.Status == EScreenStatus.End, x => x.Status == dto.Status)
             .WhereIF(dto.CreationTimeStart.HasValue, d => d.CreationTime >= dto.CreationTimeStart)

src/Hotline.Api/Controllers/QualityController.cs

@@ -203,6 +203,9 @@ namespace Hotline.Api.Controllers
 		[HttpPost("template")]
 		public async Task Add([FromBody] TemplateAddDto dto)
 		{
+			var groupingCount = await _qualityTemplate.CountAsync(x => x.Grouping == dto.Grouping && x.IsEnable == 0);
+			if (groupingCount > 0)
+				throw UserFriendlyException.SameMessage("当前已存在");
 			var model = _mapper.Map<QualityTemplate>(dto);
 			var id = await _qualityTemplate.AddAsync(model, HttpContext.RequestAborted);
 			if (string.IsNullOrEmpty(id))

src/Hotline.Share/Dtos/Order/OrderDto.cs

@@ -798,7 +798,7 @@ namespace Hotline.Share.Dtos.Order
 
         public OrderVisitDto OrderVisit { get; set; }
 
-        public OrderDto Order => OrderVisit.Order;
+        public OrderDto Order => OrderVisit != null? OrderVisit.Order: null;
 
 		/// <summary>
 		/// 语音评价（话务评价）

src/Hotline.Share/Dtos/Order/OrderScreenDto.cs

@@ -95,6 +95,16 @@ namespace Hotline.Share.Dtos.Order
 		/// </summary>
 		public OrderDto Order { get; set; }
 
+		/// <summary>
+		/// 回访明细id
+		/// </summary>
+		public string VisitDetailId { get; set; }
+
+		/// <summary>
+		/// 回访
+		/// </summary>
+		public OrderVisitDetailDto VisitDetail { get; set; }
+
 		/// <summary>
 		/// 甄别申请类型id
 		/// </summary>