Merge branch 'release' of http://110.188.24.182:10023/Fengwo/hotline into release

src/Hotline.Api/Controllers/CommonPController.cs

@@ -251,11 +251,10 @@ namespace Hotline.Api.Controllers
 				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");
+																  (x.Time < x.ActualHandleTime && x.Status >= EOrderStatus.Filed)).Take(40).ToList();
+				waitedExpiredDataList.ForEach(x => x.Type = "WaitedExpired");
 				allNum += waitedExpiredDataList.Count;
-				allList.AddRange(waitedExpiredList);
+				allList.AddRange(waitedExpiredDataList);
 				//回访待办
 				var visitDataList = await _orderVisitRepository.Queryable()
 					.Includes(d => d.Order)
@@ -279,11 +278,10 @@ namespace Hotline.Api.Controllers
 				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");
+				var signDataList = waitedList.Where(x => x.CounterSignType == ECounterSignType.Center || x.CounterSignType == ECounterSignType.Department).Take(40).ToList();
+				signDataList.ForEach(x => x.Type = "Sign");
 				allNum += signDataList.Count;
-				allList.AddRange(signList);
+				allList.AddRange(signDataList);
 				//延期待审批
 				var delayDataList = await _orderDelayRepository.Queryable(canView: true, isAdmin: isAdmin)
 					.Includes(d => d.Order)
@@ -372,7 +370,7 @@ namespace Hotline.Api.Controllers
 					WaitedNum = waitedList.Count > 40 ? 40 : waitedList.Count,
 					WaitedList = waitedList.Take(40).ToList(),
 					WaitedExpiredNum = waitedExpiredDataList.Count,
-					WaitedExpiredList = waitedExpiredList,
+					WaitedExpiredList = waitedExpiredDataList,
 					VisitListNum = visitDataList.Count,
 					VisitList = visitDataList,
 					SignDataNum = signDataList.Count,
@@ -416,17 +414,15 @@ namespace Hotline.Api.Controllers
 				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");
+																  (x.Time < x.ActualHandleTime && x.Status >= EOrderStatus.Filed)).Take(40).ToList();
+				waitedExpiredDataList.ForEach(x => x.Type = "WaitedExpired");
 				allNum += waitedExpiredDataList.Count;
-				allList.AddRange(waitedExpiredList);
+				allList.AddRange(waitedExpiredDataList);
 				//会签待办
-				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");
+				var signDataList = waitedList.Where(x => x.CounterSignType == ECounterSignType.Center || x.CounterSignType == ECounterSignType.Department).Take(40).ToList();
+				signDataList.ForEach(x => x.Type = "Sign");
 				allNum += signDataList.Count;
-				allList.AddRange(signList);
+				allList.AddRange(signDataList);
 				//甄别待审批
 				var screenDataList = await _orderScreenRepository.Queryable(hasHandled: !true, isAdmin: isAdmin)
 					.Includes(d => d.Order)
@@ -524,7 +520,7 @@ namespace Hotline.Api.Controllers
 					WaitedNum = waitedList.Count > 40 ? 40 : waitedList.Count,
 					WaitedList = waitedList.Take(40).ToList(),
 					WaitedExpiredNum = waitedExpiredDataList.Count,
-					WaitedExpiredList = waitedExpiredList,
+					WaitedExpiredList = waitedExpiredDataList,
 					SignDataNum = signDataList.Count,
 					SignDataList = signDataList,
 					ScreenNum = screenDataList.Count,