Merge branch 'master' of http://git.12345lm.cn/Fengwo/hotline

src/Hotline.Api/Controllers/CommonPController.cs

@@ -11,6 +11,7 @@ using MongoDB.Driver;
 using SqlSugar;
 using System.Reflection.Metadata;
 using Hotline.FlowEngine.Workflows;
+using Hotline.Settings.TimeLimits;
 using Hotline.Share.Enums.Order;
 using XF.Domain.Authentications;
 using XF.Domain.Exceptions;
@@ -29,7 +30,8 @@ namespace Hotline.Api.Controllers
         private readonly ISessionContext _sessionContext;
         private readonly IRepository<TrCallRecord> _trCallRecordRepository;
         private readonly IOrderRepository _orderRepository;
-        private readonly IRepository<WorkflowCountersign> _workflowCountersignRepository;
+        private readonly IOrderDelayRepository _orderDelayRepository;
+        private readonly ITimeLimitDomainService _timeLimitDomainService;
 
 		public CommonPController(
             ISystemCommonOpinionDomainService commonOpinionDomainService,
@@ -38,7 +40,8 @@ namespace Hotline.Api.Controllers
             IRepository<TrCallRecord> trCallRecordRepository,
             IOrderRepository orderRepository,
 			IMapper mapper,
-            IRepository<WorkflowCountersign> workflowCountersignRepository)
+            IOrderDelayRepository orderDelayRepository,
+            ITimeLimitDomainService timeLimitDomainService)
         {
             _commonOpinionDomainService = commonOpinionDomainService;
             _systemAreaDomainService= systemAreaDomainService;
@@ -46,7 +49,8 @@ namespace Hotline.Api.Controllers
             _sessionContext = sessionContext;
             _trCallRecordRepository = trCallRecordRepository;
             _orderRepository = orderRepository;
-            _workflowCountersignRepository = workflowCountersignRepository;
+            _orderDelayRepository = orderDelayRepository;
+            _timeLimitDomainService = timeLimitDomainService;
 		}
 
        
@@ -104,15 +108,16 @@ namespace Hotline.Api.Controllers
                {
                    aboutExpire = SqlFunc.AggregateSum(SqlFunc.IIF(time > o.NearlyExpiredTime!.Value && time < o.ExpiredTime!.Value, 1, 0)),
                    havExpired = SqlFunc.AggregateSum(SqlFunc.IIF( time > o.ExpiredTime!.Value, 1, 0)),
+                   countersignHandle = SqlFunc.AggregateSum(SqlFunc.IIF(o.CounterSignType.HasValue, 1, 0)),
 
 			   }).FirstAsync();
             var aboutExpire = order?.aboutExpire ?? 0;
             var havExpired = order?.havExpired ?? 0;
+            var countersignHandle = order?.countersignHandle ?? 0;
 
-            //var Countersign = await _
 
 
-            return new { AboutExpire = aboutExpire, HavExpired = havExpired, CountersignHandle = "aa", ScreenAudit = "aa", Delay = "aa", ScreenHandle = "aa" };
+			return new { AboutExpire = aboutExpire, HavExpired = havExpired, CountersignHandle = countersignHandle, ScreenAudit = "aa", Delay = "aa", ScreenHandle = "aa" };
         }
 	}
 }

src/Hotline.Api/Controllers/OrderController.cs

@@ -2641,7 +2641,7 @@ public class OrderController : BaseController
         handleStatuses = handleStatuses.WhereIF(dto.IsHandled.HasValue,
                 d => dto.IsHandled!.Value
                     ? d is not EOrderStatus.WaitForAccept and not EOrderStatus.BackToUnAccept and not EOrderStatus.SpecialToUnAccept
-					: d is EOrderStatus.WaitForAccept or EOrderStatus.BackToUnAccept or  not EOrderStatus.SpecialToUnAccept)
+					: d is EOrderStatus.WaitForAccept or EOrderStatus.BackToUnAccept or  EOrderStatus.SpecialToUnAccept)
             .ToArray();
 
         var (total, items) = await _orderRepository.Queryable(viewFilter: false)