datascreen

src/Hotline.Api/Controllers/Bi/BiOrderController.cs

@@ -643,7 +643,13 @@ namespace Hotline.Api.Controllers.Bi
                     OrgName = x.VisitOrgName,
                     OrgCode = x.VisitOrgCode,
                     TotalSumCount = SqlFunc.AggregateCount(x.VisitOrgCode),
-                    VerySatisfiedCount = SqlFunc.AggregateSum(SqlFunc.IIF(SqlFunc.JsonListObjectAny(x.OrgProcessingResults, "key", "5"), 1, 0)),//非常满意数
+                    VerySatisfiedCount = SqlFunc.AggregateSum(SqlFunc.IIF(SqlFunc.JsonListObjectAny(x.OrgProcessingResults, "Key", "5"), 1, 0)),//非常满意数
+                    SatisfiedCount = SqlFunc.AggregateSum(SqlFunc.IIF(SqlFunc.JsonListObjectAny(x.OrgProcessingResults, "Key", "4"),1,0)), //满意数
+                    GeneralSatisfiedCount = SqlFunc.AggregateSum(SqlFunc.IIF(SqlFunc.JsonListObjectAny(x.OrgProcessingResults, "Key", "3"),1,0))+ SqlFunc.AggregateSum(SqlFunc.IIF(SqlFunc.JsonListObjectAny(x.OrgProcessingResults, "Key", "0"), 1, 0)),//一般满意
+                    NoSatisfiedCount = SqlFunc.AggregateSum(SqlFunc.IIF(SqlFunc.JsonListObjectAny(x.OrgProcessingResults, "Key", "2"),1,0)),//不满意
+                    VeryNoSatisfiedCount = SqlFunc.AggregateSum(SqlFunc.IIF(SqlFunc.JsonListObjectAny(x.OrgProcessingResults, "Key", "1"),1,0)),//非常不满意
+                    NoEvaluateCount = SqlFunc.AggregateSum(SqlFunc.IIF(SqlFunc.JsonListObjectAny(x.OrgProcessingResults, "Key", "7"),1,0)),//未做评价
+                    NoPutThroughCount = SqlFunc.AggregateSum(SqlFunc.IIF(SqlFunc.JsonListObjectAny(x.OrgProcessingResults, "Key", "6"),1,0)),//未接通
                 })
                 .ToListAsync();
 

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

@@ -203,10 +203,10 @@ namespace Hotline.Api.Controllers.Bigscreen
             var dto = new OrderCountStatisticsDto();
             #region 当日工单量
 
-            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();
+            dto.ToDayCount = await _orderRepository.Queryable(false,false,false).Where(x => x.StartTime.Value.Date == DateTime.Now.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)
+                .Where(x=>x.StartTime.Value.Date == DateTime.Now.AddDays(-1).Date && x.Status > EOrderStatus.WaitForAccept)
                 .CountAsync();
                 
 
@@ -278,7 +278,8 @@ namespace Hotline.Api.Controllers.Bigscreen
                     AreaName = o.AreaName,
                     AcceptedCount = SqlFunc.AggregateCount(it.AreaCode.Substring(SqlFunc.MappingColumn<int>("0"), SqlFunc.MappingColumn<int>("6"))),
                     CompletionCount = SqlFunc.AggregateSum(SqlFunc.IIF(it.Status>= EOrderStatus.Filed,1,0))
-                }).MergeTable().OrderByDescending(it=> it.AcceptedCount).ToListAsync();
+                }).MergeTable()
+                .Where(x=> x.AreaCode!= "519800" && x.AreaCode!= "519900").OrderByDescending(it=> it.AcceptedCount).ToListAsync();
             return list;
         }
 
@@ -371,8 +372,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.Parse("2024-03-14").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

@@ -2067,7 +2067,7 @@ public class OrderController : BaseController
             .WhereIF(dto.Channels.Any(), d => dto.Channels.Contains(d.SourceChannelCode)) //来源渠道
             .WhereIF(dto.HotspotIds.Any(), d => dto.HotspotIds.Contains(d.HotspotId)) //热点类型
             .WhereIF(!string.IsNullOrEmpty(dto.TransferPhone), d => d.TransferPhone.Contains(dto.TransferPhone!)) //转接号码
-                                                                                                                  //.WhereIF(dto.OrgCodes.Any(), d => d.Workflow.Assigns.Any(s => dto.OrgCodes.Contains(s.OrgCode)))
+            //.WhereIF(dto.OrgCodes.Any(), d => d.Workflow.Assigns.Any(s => dto.OrgCodes.Contains(s.OrgCode)))
             .WhereIF(dto.OrgCodes.Any(), d => dto.OrgCodes.Contains(d.ActualHandleOrgCode)) //接办部门
             .WhereIF(!string.IsNullOrEmpty(dto.NameOrNo), d => d.AcceptorName.Contains(dto.NameOrNo!) || d.AcceptorStaffNo.Contains(dto.NameOrNo!)) //受理人/坐席
             .WhereIF(dto.CreationTimeStart.HasValue, d => d.CreationTime >= dto.CreationTimeStart) //受理时间开始

src/Hotline.Application/Bigscreen/DataScreenRefreshService.cs

@@ -42,10 +42,11 @@ namespace Hotline.Application.Bigscreen
                     var dto = new OrderCountStatisticsDto();
                     #region 当日工单量
 
-                    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();
+                    dto.ToDayCount = await _orderRepository.Queryable(false, false, false)
+                        .Where(x => x.StartTime.Value.Date == DateTime.Now.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)
+                        .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)
@@ -99,8 +100,8 @@ namespace Hotline.Application.Bigscreen
                 {
                     var list = await _orderRepository
                         .Queryable(false, false, false)
-                        //.Where(x => x.Status > EOrderStatus.WaitForAccept && x.Status < EOrderStatus.Filed)
-                        .Where(x => x.Status > EOrderStatus.WaitForAccept && x.StartTime.Value.Date == DateTime.Parse("2024-03-14").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.Share/Dtos/CallCenter/BiCallDto.cs

@@ -11,7 +11,7 @@ namespace Hotline.Share.Dtos.CallCenter
         /// <summary>
         /// 小时跨度
         /// </summary>
-        public string HourRange => Hour == 23 ? "23~24" : $"{Hour:00}~{(Hour + 1):00}";
+        public string HourRange => Hour == 23 ? "23:00~24:00" : $"{Hour.ToString():00}~{(Hour + 1).ToString():00}";
 
         public int Hour { get; set; }