Merge branch 'master' of http://110.188.24.182:10023/Fengwo/hotline

src/Hotline.Api/Controllers/Bigscreen/DataScreenController.cs

@@ -150,7 +150,7 @@ namespace Hotline.Api.Controllers.Bigscreen
         public async Task<List<OrderTypeHandleStatisticsDto>> OrderTypeHandleStatistics(DateTime StartDate,DateTime EndDate)
         {
             EndDate = EndDate.AddDays(1).AddSeconds(-1);
-            var list =await _orderRepository.Queryable(false, false, false).Where(x => x.StartTime >= StartDate && x.StartTime <= EndDate && x.Status > EOrderStatus.Handling)
+            var list =await _orderRepository.Queryable(false, false, false).Where(x => x.StartTime >= StartDate && x.StartTime <= EndDate && x.Status > EOrderStatus.Handling && !string.IsNullOrEmpty(x.AcceptType))
                 .GroupBy(x=>x.AcceptType)
                 .Select(x => new OrderTypeHandleStatisticsDto
                 { 
@@ -203,8 +203,12 @@ namespace Hotline.Api.Controllers.Bigscreen
             var dto = new OrderCountStatisticsDto();
             #region 当日工单量
 
-            dto.ToDayCount =await _orderRepository.Queryable(false,false,false).Where(x => x.StartTime.Value.Date == today.Date && x.Status > EOrderStatus.WaitForAccept).CountAsync();
-            var beforToDayCount = await _orderRepository.Queryable(false, false, false).Where(x => x.StartTime.Value.Date == today.AddDays(-1).Date && x.Status > EOrderStatus.WaitForAccept).CountAsync();
+            dto.ToDayCount =await _orderRepository.Queryable(false,false,false).Where(x => x.StartTime.Value.Date == DateTime.Parse("2024-03-14").Date && x.Status > EOrderStatus.WaitForAccept).CountAsync();
+            var beforToDayCount = await _orderRepository.Queryable(false, false, false)
+                //.Where(x => x.StartTime.Value.Date == today.AddDays(-1).Date && x.Status > EOrderStatus.WaitForAccept)
+                .Where(x=>x.StartTime.Value.Date == DateTime.Parse("2024-03-14").AddDays(-1).Date && x.Status > EOrderStatus.WaitForAccept)
+                .CountAsync();
+                
 
             if (beforToDayCount == 0)
             {
@@ -367,7 +371,8 @@ namespace Hotline.Api.Controllers.Bigscreen
         {
             var list = await _orderRepository
                 .Queryable(false, false, false)
-                .Where(x => x.Status > EOrderStatus.WaitForAccept  && x.StartTime.Value.Date == DateTime.Now.Date )
+                //.Where(x => x.Status > EOrderStatus.WaitForAccept  && x.StartTime.Value.Date == DateTime.Now.Date )
+                .Where(x => x.Status > EOrderStatus.WaitForAccept && x.StartTime.Value.Date == DateTime.Parse("2024-03-14").Date)
                 .OrderByDescending(x=>x.StartTime)
                 .Take(50)
                 .ToListAsync();

src/Hotline.Api/Controllers/OrderController.cs

@@ -2309,20 +2309,25 @@ public class OrderController : BaseController
 
         try
         {
-            //if (dto.Workflow.NextHandlers.Any(d => d.Key == "001170" || d.Key == "001177"))
-            //{
-            //    var s = _timeLimitDomainService.CalcEndTime(DateTime.Now, ETimeType.WorkDay, 45, 80);
-            //    var n = new ExpiredTimeWithConfig
-            //    {
-            //        Count = s.
-            //    }
-            //}
+            var expiredTimeConfig = new ExpiredTimeWithConfig();
+            if (dto.Workflow.NextHandlers.Any(d => d.Key == "001170" || d.Key == "001177"))
+            {
+                var s = _timeLimitDomainService.CalcEndTime(DateTime.Now, ETimeType.WorkDay, 45, 80);
+                expiredTimeConfig = new ExpiredTimeWithConfig
+                {
+                    Count = 45,
+                    TimeType = ETimeType.WorkDay,
+                    TimeText = "45个工作日",
+                    ExpiredTime = s.EndTime,
+                    NearlyExpiredTime = s.NearlyExpiredTime
+                };
+            }
+            else
+            {
+                //期满时间
+                expiredTimeConfig = _timeLimitDomainService.CalcExpiredTime(DateTime.Now, EFlowDirection.OrgToCenter, dto.Data.AcceptTypeCode);
+            }
             // if(dto.Workflow.HandlerType is EHandlerType.AssignedOrg or EHandlerType.OrgLevel or EHandlerType.OrgType && dto.Workflow.NextStepCode)
-
-
-            //期满时间
-            var expiredTimeConfig = _timeLimitDomainService.CalcExpiredTime(DateTime.Now, EFlowDirection.OrgToCenter, dto.Data.AcceptTypeCode);
-
             var startDto = _mapper.Map<StartWorkflowDto>(dto.Workflow);
             startDto.DefinitionModuleCode = WorkflowModuleConsts.OrderHandle;
             startDto.Title = dto.Data.Title;

src/Hotline.Repository.SqlSugar/Extensions/SqlSugarStartupExtensions.cs

@@ -207,8 +207,8 @@ namespace Hotline.Repository.SqlSugar.Extensions
             /***写AOP等方法***/
             db.Aop.OnLogExecuting = (sql, pars) =>
             {
-                //Log.Information("Sql: {0}", sql);
-                //Log.Information("SqlParameters: {0}", string.Join(',', pars.Select(d => d.Value)));
+                Log.Information("Sql: {0}", sql);
+                Log.Information("SqlParameters: {0}", string.Join(',', pars.Select(d => d.Value)));
             };
             db.Aop.OnError = (exp) =>//SQL报错
             {