|
|
@@ -255,15 +255,15 @@ namespace Hotline.Api.Controllers
|
|
|
CounterSignType = d.CounterSignType
|
|
|
})
|
|
|
.ToListAsync();
|
|
|
- allNum += waitedList.Count > 40 ? 40: waitedList.Count;
|
|
|
- allList.AddRange(waitedList);
|
|
|
+ //allNum += waitedList.Count > 40 ? 40: waitedList.Count;
|
|
|
+ //allList.AddRange(waitedList);
|
|
|
// 已超期
|
|
|
var waitedExpiredDataList = waitedList.Where(x => (x.Time < DateTime.Now && x.Status < EOrderStatus.Filed) ||
|
|
|
(x.Time < x.ActualHandleTime && x.Status >= EOrderStatus.Filed)).ToList();
|
|
|
var waitedExpiredList = waitedExpiredDataList.Take(40).ToList();
|
|
|
waitedExpiredList.ForEach(x => x.Type = "WaitedExpired");
|
|
|
- allNum += waitedExpiredDataList.Count;
|
|
|
- allList.AddRange(waitedExpiredList);
|
|
|
+ //allNum += waitedExpiredDataList.Count;
|
|
|
+ //allList.AddRange(waitedExpiredList);
|
|
|
//回访待办
|
|
|
var visitDataList = await _orderVisitRepository.Queryable()
|
|
|
.Includes(d => d.Order)
|
|
|
@@ -284,14 +284,14 @@ namespace Hotline.Api.Controllers
|
|
|
})
|
|
|
.Take(40)
|
|
|
.ToListAsync();
|
|
|
- allNum += visitDataList.Count;
|
|
|
- allList.AddRange(visitDataList);
|
|
|
+ //allNum += visitDataList.Count;
|
|
|
+ //allList.AddRange(visitDataList);
|
|
|
//会签待办
|
|
|
var signDataList = waitedList.Where(x => x.CounterSignType == ECounterSignType.Center || x.CounterSignType == ECounterSignType.Department).ToList();
|
|
|
var signList = signDataList.Take(40).ToList();
|
|
|
signList.ForEach(x => x.Type = "Sign");
|
|
|
- allNum += signDataList.Count;
|
|
|
- allList.AddRange(signList);
|
|
|
+ //allNum += signDataList.Count;
|
|
|
+ //allList.AddRange(signList);
|
|
|
//延期待审批
|
|
|
var delayDataList = await _orderDelayRepository.Queryable(canView: true, isAdmin: isAdmin)
|
|
|
.Includes(d => d.Order)
|
|
|
@@ -310,8 +310,8 @@ namespace Hotline.Api.Controllers
|
|
|
CounterSignType = d.Order.CounterSignType
|
|
|
}).Take(40)
|
|
|
.ToListAsync();
|
|
|
- allNum += delayDataList.Count;
|
|
|
- allList.AddRange(delayDataList);
|
|
|
+ //allNum += delayDataList.Count;
|
|
|
+ //allList.AddRange(delayDataList);
|
|
|
//部门即将超期
|
|
|
var nearlyExpiredDataList = await _orderRepository.Queryable(canView: !IsCenter)
|
|
|
.Includes(d => d.OrderDelays)
|
|
|
@@ -330,8 +330,8 @@ namespace Hotline.Api.Controllers
|
|
|
CounterSignType = d.CounterSignType
|
|
|
}).Take(40)
|
|
|
.ToListAsync();
|
|
|
- allNum += nearlyExpiredDataList.Count;
|
|
|
- allList.AddRange(nearlyExpiredDataList);
|
|
|
+ //allNum += nearlyExpiredDataList.Count;
|
|
|
+ //allList.AddRange(nearlyExpiredDataList);
|
|
|
//甄别待审批
|
|
|
var screenDataList = await _orderScreenRepository.Queryable(hasHandled: !true, isAdmin: isAdmin)
|
|
|
.Includes(d => d.Order)
|
|
|
@@ -350,8 +350,8 @@ namespace Hotline.Api.Controllers
|
|
|
CounterSignType = d.Order.CounterSignType
|
|
|
}).Take(40)
|
|
|
.ToListAsync();
|
|
|
- allNum += screenDataList.Count;
|
|
|
- allList.AddRange(screenDataList);
|
|
|
+ //allNum += screenDataList.Count;
|
|
|
+ //allList.AddRange(screenDataList);
|
|
|
//退回待审批
|
|
|
var sendBackAuditDataList = await _orderSendBackAuditRepository.Queryable()
|
|
|
.Includes(d => d.Order)
|
|
|
@@ -371,8 +371,8 @@ namespace Hotline.Api.Controllers
|
|
|
CounterSignType = d.Order.CounterSignType
|
|
|
}).Take(40)
|
|
|
.ToListAsync();
|
|
|
- allNum += sendBackAuditDataList.Count;
|
|
|
- allList.AddRange(sendBackAuditDataList);
|
|
|
+ //allNum += sendBackAuditDataList.Count;
|
|
|
+ //allList.AddRange(sendBackAuditDataList);
|
|
|
return new
|
|
|
{
|
|
|
AllNum = allNum,
|
|
|
@@ -420,8 +420,8 @@ namespace Hotline.Api.Controllers
|
|
|
CounterSignType = d.CounterSignType
|
|
|
})
|
|
|
.ToListAsync();
|
|
|
- allNum += waitedList.Count > 40 ? 40 : waitedList.Count;
|
|
|
- allList.AddRange(waitedList);
|
|
|
+ //allNum += waitedList.Count > 40 ? 40 : waitedList.Count;
|
|
|
+ //allList.AddRange(waitedList);
|
|
|
//已超期
|
|
|
var waitedExpiredDataList = waitedList.Where(x => (x.Time < DateTime.Now && x.Status < EOrderStatus.Filed) ||
|
|
|
(x.Time < x.ActualHandleTime && x.Status >= EOrderStatus.Filed)).ToList();
|
|
|
@@ -433,8 +433,8 @@ namespace Hotline.Api.Controllers
|
|
|
var signDataList = waitedList.Where(x => x.CounterSignType == ECounterSignType.Center || x.CounterSignType == ECounterSignType.Department).ToList();
|
|
|
var signList = signDataList.Take(40).ToList();
|
|
|
signList.ForEach(x => x.Type = "Sign");
|
|
|
- allNum += signDataList.Count;
|
|
|
- allList.AddRange(signList);
|
|
|
+ //allNum += signDataList.Count;
|
|
|
+ //allList.AddRange(signList);
|
|
|
//甄别待审批
|
|
|
var screenDataList = await _orderScreenRepository.Queryable(hasHandled: !true, isAdmin: isAdmin)
|
|
|
.Includes(d => d.Order)
|
|
|
@@ -453,8 +453,8 @@ namespace Hotline.Api.Controllers
|
|
|
CounterSignType = d.Order.CounterSignType
|
|
|
}).Take(40)
|
|
|
.ToListAsync();
|
|
|
- allNum += screenDataList.Count;
|
|
|
- allList.AddRange(screenDataList);
|
|
|
+ //allNum += screenDataList.Count;
|
|
|
+ //allList.AddRange(screenDataList);
|
|
|
//延期待审批
|
|
|
var delayDataList = await _orderDelayRepository.Queryable(canView: true, isAdmin: isAdmin)
|
|
|
.Includes(d => d.Order)
|
|
|
@@ -473,8 +473,8 @@ namespace Hotline.Api.Controllers
|
|
|
CounterSignType = d.Order.CounterSignType
|
|
|
}).Take(40)
|
|
|
.ToListAsync();
|
|
|
- allNum += delayDataList.Count;
|
|
|
- allList.AddRange(delayDataList);
|
|
|
+ //allNum += delayDataList.Count;
|
|
|
+ //allList.AddRange(delayDataList);
|
|
|
//甄别待申请
|
|
|
var screenApplyDataList = await _orderVisitedDetailRepository.Queryable(false, true)
|
|
|
.Includes(x => x.OrderVisit)
|
|
|
@@ -502,8 +502,8 @@ namespace Hotline.Api.Controllers
|
|
|
Status = x.OrderVisit.Order.Status,
|
|
|
CounterSignType = x.OrderVisit.Order.CounterSignType
|
|
|
}).Take(40).ToListAsync();
|
|
|
- allNum += screenApplyDataList.Count;
|
|
|
- allList.AddRange(screenApplyDataList);
|
|
|
+ //allNum += screenApplyDataList.Count;
|
|
|
+ //allList.AddRange(screenApplyDataList);
|
|
|
//退回待审批
|
|
|
var sendBackAuditDataList = await _orderSendBackAuditRepository.Queryable()
|
|
|
.Includes(d => d.Order)
|
|
|
@@ -523,12 +523,32 @@ namespace Hotline.Api.Controllers
|
|
|
CounterSignType = d.Order.CounterSignType
|
|
|
}).Take(40)
|
|
|
.ToListAsync();
|
|
|
- allNum += sendBackAuditDataList.Count;
|
|
|
- allList.AddRange(sendBackAuditDataList);
|
|
|
+ //allNum += sendBackAuditDataList.Count;
|
|
|
+ //allList.AddRange(sendBackAuditDataList);
|
|
|
+ //部门即将超期
|
|
|
+ var nearlyExpiredDataList = await _orderRepository.Queryable(canView: !IsCenter)
|
|
|
+ .Includes(d => d.OrderDelays)
|
|
|
+ .Where(d => d.Status < EOrderStatus.Filed && DateTime.Now > d.NearlyExpiredTime && DateTime.Now < d.ExpiredTime)
|
|
|
+ .OrderByDescending(d => d.CreationTime)
|
|
|
+ .Select(d => new HomeOrderDto
|
|
|
+ {
|
|
|
+ No = d.No,
|
|
|
+ OrderId = d.Id,
|
|
|
+ Title = d.Title,
|
|
|
+ AcceptType = d.AcceptType,
|
|
|
+ HotspotName = d.HotspotName,
|
|
|
+ Type = "NearlyExpired",
|
|
|
+ Time = d.ExpiredTime,
|
|
|
+ Status = d.Status,
|
|
|
+ CounterSignType = d.CounterSignType
|
|
|
+ }).Take(40)
|
|
|
+ .ToListAsync();
|
|
|
+ //allNum += nearlyExpiredDataList.Count;
|
|
|
+ //allList.AddRange(nearlyExpiredDataList);
|
|
|
return new
|
|
|
{
|
|
|
- AllNum = allNum,
|
|
|
- AllList = allList,
|
|
|
+ //AllNum = allNum,
|
|
|
+ //AllList = allList,
|
|
|
WaitedNum = waitedList.Count > 40 ? 40 : waitedList.Count,
|
|
|
WaitedList = waitedList.Take(40).ToList(),
|
|
|
WaitedExpiredNum = waitedExpiredDataList.Count,
|
|
|
@@ -542,7 +562,9 @@ namespace Hotline.Api.Controllers
|
|
|
ScreenApplyNum = screenApplyDataList.Count,
|
|
|
ScreenApplyList = screenApplyDataList,
|
|
|
SendBackAuditNum = sendBackAuditDataList.Count,
|
|
|
- SendBackAuditList = sendBackAuditDataList
|
|
|
+ SendBackAuditList = sendBackAuditDataList,
|
|
|
+ NearlyExpiredNum = nearlyExpiredDataList.Count,
|
|
|
+ NearlyExpiredList = nearlyExpiredDataList,
|
|
|
};
|
|
|
}
|
|
|
}
|
