浏览代码

查询工单预警信息

Dun.Jason 1 月之前
父节点
当前提交
47e7390864
共有 1 个文件被更改,包括 15 次插入18 次删除
  1. 15 18
      src/Hotline.Api/Controllers/OrderController.cs

+ 15 - 18
src/Hotline.Api/Controllers/OrderController.cs

@@ -4270,26 +4270,23 @@ public class OrderController : BaseController
         var orderList = await _orderRepository.Queryable()
         .Where(x => x.CreationTime <= now && x.CreationTime >= now.AddDays(-30) && x.IsUrgent == true && SqlFunc.JsonArrayAny(x.Sensitive, order!.Sensitive)).ToListAsync();
 
-        if (orderList!=null && orderList.Count>0)
+       
+        var orderEarlyList = new List<OrderEarlyInfo>();
+        foreach (var item in order!.Sensitive!)
         {
-            var orderEarlyList = new List<OrderEarlyInfo>();
-            foreach (var item in order!.Sensitive!)
-            {
-                var model = new OrderEarlyInfo();
-                model.KeyWord = item;
-                model.WeekNum = orderList.Where(x => SqlFunc.JsonArrayAny(x.Sensitive, item) && x.CreationTime <= now && x.CreationTime >= now.AddDays(-7)).Count();
-                model.MonthNum = orderList.Where(x => SqlFunc.JsonArrayAny(x.Sensitive, item)).Count();
-                orderEarlyList.Add(model);
-            }
-            var orderEarly = await _orderEarlyWarningRepository.Queryable().FirstAsync(x => x.OrderId == id);
-
-            return new
-            {
-                OrderEarlyInfo = orderEarlyList,
-                OrderEarly = orderEarly,
-            };
+            var model = new OrderEarlyInfo();
+            model.KeyWord = item;
+            model.WeekNum = orderList.Where(x => SqlFunc.JsonArrayAny(x.Sensitive, item) && x.CreationTime <= now && x.CreationTime >= now.AddDays(-7)).Count();
+            model.MonthNum = orderList.Where(x => SqlFunc.JsonArrayAny(x.Sensitive, item)).Count();
+            orderEarlyList.Add(model);
         }
-        return null;
+        var orderEarly = await _orderEarlyWarningRepository.Queryable().FirstAsync(x => x.OrderId == id);
+
+        return new
+        {
+            OrderEarlyInfo = orderEarlyList,
+            OrderEarly = orderEarly,
+        };
     }
 
     /// <summary>