|
|
@@ -432,20 +432,20 @@ namespace Hotline.Api.Controllers
|
|
|
.ToListAsync();
|
|
|
var waitedList = waitedDataList.Where(x => x.Status != EOrderStatus.Countersigning &&
|
|
|
x.Time > DateTime.Now && x.Status < EOrderStatus.Filed && DateTime.Now < x.NearlyExpiredTime
|
|
|
- ).OrderBy(x=>x.Time).Take(40).ToList();
|
|
|
+ ).OrderBy(x=>x.Time).ToList();
|
|
|
waitedList = waitedList.Count > 0 ? waitedList.Copy() : waitedList;
|
|
|
//allNum += waitedList.Count > 40 ? 40 : waitedList.Count;
|
|
|
//allList.AddRange(waitedList);
|
|
|
//已超期
|
|
|
var waitedExpiredDataList = waitedDataList.Where(x => (x.Time < DateTime.Now && x.Status < EOrderStatus.Filed) ||
|
|
|
(x.Time < x.ActualHandleTime && x.Status >= EOrderStatus.Filed))
|
|
|
- .OrderBy(x=> x.Time).Take(40).ToList();
|
|
|
+ .OrderBy(x=> x.Time).ToList();
|
|
|
waitedExpiredDataList = waitedExpiredDataList.Count > 0 ? waitedExpiredDataList.Copy() : waitedExpiredDataList;
|
|
|
waitedExpiredDataList.ForEach(x => x.Type = "WaitedExpired");
|
|
|
//allNum += waitedExpiredDataList.Count;
|
|
|
//allList.AddRange(waitedExpiredDataList);
|
|
|
//会签待办
|
|
|
- var signDataList = waitedDataList.Where(x => x.Status == EOrderStatus.Countersigning).OrderBy(x => x.Time).Take(40).ToList();
|
|
|
+ var signDataList = waitedDataList.Where(x => x.Status == EOrderStatus.Countersigning).OrderBy(x => x.Time).ToList();
|
|
|
signDataList = signDataList.Count > 0 ? signDataList.Copy() : signDataList;
|
|
|
signDataList.ForEach(x => x.Type = "Sign");
|
|
|
|
|
|
@@ -467,7 +467,7 @@ namespace Hotline.Api.Controllers
|
|
|
Time = d.Order.ExpiredTime,
|
|
|
Status = d.Order.Status,
|
|
|
CounterSignType = d.Order.CounterSignType
|
|
|
- }).Take(40)
|
|
|
+ })
|
|
|
.ToListAsync();
|
|
|
//allNum += screenDataList.Count;
|
|
|
//allList.AddRange(screenDataList);
|
|
|
@@ -487,7 +487,7 @@ namespace Hotline.Api.Controllers
|
|
|
Time = d.Order.ExpiredTime,
|
|
|
Status = d.Order.Status,
|
|
|
CounterSignType = d.Order.CounterSignType
|
|
|
- }).Take(40)
|
|
|
+ })
|
|
|
.ToListAsync();
|
|
|
//allNum += delayDataList.Count;
|
|
|
//allList.AddRange(delayDataList);
|
|
|
@@ -518,7 +518,7 @@ namespace Hotline.Api.Controllers
|
|
|
Time = x.OrderVisit.Order.ExpiredTime,
|
|
|
Status = x.OrderVisit.Order.Status,
|
|
|
CounterSignType = x.OrderVisit.Order.CounterSignType
|
|
|
- }).Take(40).ToListAsync();
|
|
|
+ }).ToListAsync();
|
|
|
//allNum += screenApplyDataList.Count;
|
|
|
//allList.AddRange(screenApplyDataList);
|
|
|
//退回待审批
|
|
|
@@ -538,7 +538,7 @@ namespace Hotline.Api.Controllers
|
|
|
Time = d.Order.ExpiredTime,
|
|
|
Status = d.Order.Status,
|
|
|
CounterSignType = d.Order.CounterSignType
|
|
|
- }).Take(40)
|
|
|
+ })
|
|
|
.ToListAsync();
|
|
|
//allNum += sendBackAuditDataList.Count;
|
|
|
//allList.AddRange(sendBackAuditDataList);
|
|
|
@@ -564,14 +564,14 @@ namespace Hotline.Api.Controllers
|
|
|
Time = d.ExpiredTime,
|
|
|
Status = d.Status,
|
|
|
CounterSignType = d.CounterSignType
|
|
|
- }).Take(40)
|
|
|
+ })
|
|
|
.ToListAsync();
|
|
|
return new
|
|
|
{
|
|
|
//AllNum = allNum,
|
|
|
//AllList = allList,
|
|
|
- WaitedNum = waitedList.Count > 40 ? 40 : waitedList.Count,
|
|
|
- WaitedList = waitedList.Take(40).ToList(),
|
|
|
+ WaitedNum = waitedList.Count,
|
|
|
+ WaitedList = waitedList.ToList(),
|
|
|
WaitedExpiredNum = waitedExpiredDataList.Count,
|
|
|
WaitedExpiredList = waitedExpiredDataList,
|
|
|
SignDataNum = signDataList.Count,
|
Dun.Jason