|
@@ -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>
|