Ver código fonte

预警信息

Dun.Jason 1 mês atrás
pai
commit
99a86d1cfd

+ 3 - 2
src/Hotline.Application/OrderApp/OrderApplication.cs

@@ -5192,8 +5192,9 @@ public class OrderApplication : IOrderApplication, IScopeDependency
             model.SeatEarlyWarningTypeValue = seatEarlyWarningTypeValue;
             model.SeatEarlyWarningTypeName = seatEarlyWarningTypeName;
             //预警预选信息
-            //_earlyWarningSettingRepository.Queryable()
-            //    .Where(x=>SqlFunc.JsonField(x.EarlyWarningRules))
+            var earlyList = _earlyWarningSettingRepository.Queryable()
+                .Where(x => intersect.Contains(SqlFunc.JsonField(x.EarlyWarningRules, "SensitiveWord")));
+
             model.CanChooseEarlyWarning = null;
 
             await _orderEarlyWarningRepository.AddAsync(model, cancellationToken);

+ 10 - 0
src/Hotline.Share/Dtos/Early/EarlyDto.cs

@@ -79,6 +79,16 @@ namespace Hotline.Share.Dtos.Early
         /// 次数
         /// </summary>
         public int Times { get; set; }
+
+        /// <summary>
+        /// 顺序
+        /// </summary>
+        public int Sort { get; set; }
+
+        /// <summary>
+        /// 下一节点条件
+        /// </summary>
+        public ENextWhere? NextWhere { get; set; }
     }
 
     public record EarlySettingPageListRequest:PagedRequest