Merge branch 'dev_dss' of Fengwo/hotline into dev

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

@@ -218,21 +218,22 @@ namespace Hotline.Api.Controllers.Bi
             dto.EndTime = dto.EndTime.Value.AddDays(1).AddSeconds(-1);
 
             var query = _orderRepository.Queryable(false, false, false)
-                .WhereIF(dto.StartTime.HasValue, x => x.CreationTime >= dto.StartTime)
-                .WhereIF(dto.EndTime.HasValue, x => x.CreationTime <= dto.EndTime)
-                .WhereIF(!string.IsNullOrEmpty(dto.Keyword), x => x.AcceptorName.Contains(dto.Keyword!))
-                .GroupBy(x => new { x.AcceptorId, x.AcceptorName })
-                .Select(x => new OrderBiCentreDataListVo
+                .WhereIF(dto.StartTime.HasValue, it => it.CreationTime >= dto.StartTime)
+                .WhereIF(dto.EndTime.HasValue, it => it.CreationTime <= dto.EndTime)
+                .WhereIF(!string.IsNullOrEmpty(dto.Keyword), it => it.SignerName.Contains(dto.Keyword!))
+                .GroupBy(it => new { it.SignerId, it.SignerName })
+                .Select(it => new OrderBiCentreDataListVo
                 {
-                    UserName = x.AcceptorName,
-                    UserId = x.AcceptorId,
+                    UserName = it.SignerName,
+                    UserId = it.SignerId,
                     //Subtotal = SqlFunc.AggregateCount(x.AcceptorId),
-                    CentreArchive = SqlFunc.AggregateSum(SqlFunc.IIF(x.Status >= EOrderStatus.Filed && x.ProcessType == EProcessType.Zhiban, 1, 0)),
-                    CentreCareOf = SqlFunc.AggregateSum(SqlFunc.IIF(x.Status >= EOrderStatus.Filed && x.ProcessType == EProcessType.Jiaoban, 1, 0)),
+                    CentreArchive = SqlFunc.AggregateSum(SqlFunc.IIF(it.Status >= EOrderStatus.Filed && it.ProcessType == EProcessType.Zhiban, 1, 0)),
+                    //CentreCareOf = SqlFunc.AggregateSum(SqlFunc.IIF(it.Status >= EOrderStatus.Filed && it.ProcessType == EProcessType.Jiaoban, 1, 0)),
+                    CentreCareOf = SqlFunc.AggregateSum(SqlFunc.IIF((it.Status >= EOrderStatus.Filed && it.ProcessType == EProcessType.Jiaoban),1,0)),
                     //NoCentreCareOf = SqlFunc.AggregateSum(SqlFunc.IIF((int)x.Status < 300 && x.ExpiredTime > x.FiledTime, 1, 0)),
-                    Invalid = SqlFunc.AggregateSum(SqlFunc.IIF(x.AcceptType == "无效", 1, 0)),
-                    Repeat = SqlFunc.AggregateSum(SqlFunc.IIF(x.DuplicateIds != null && SqlFunc.JsonArrayLength(x.DuplicateIds) > 0, 1, 0)),
-                    Subtotal = SqlFunc.AggregateSum(SqlFunc.IIF(x.Status >= EOrderStatus.Filed || x.AcceptType == "无效" || (x.DuplicateIds != null && SqlFunc.JsonArrayLength(x.DuplicateIds) > 0), 1, 0))
+                    Invalid = SqlFunc.AggregateSum(SqlFunc.IIF(it.AcceptType == "无效", 1, 0)),
+                    Repeat = SqlFunc.AggregateSum(SqlFunc.IIF(it.DuplicateIds != null && SqlFunc.JsonArrayLength(it.DuplicateIds) > 0, 1, 0)),
+                    Subtotal = SqlFunc.AggregateSum(SqlFunc.IIF(it.Status >= EOrderStatus.Filed || it.AcceptType == "无效" || (it.DuplicateIds != null && SqlFunc.JsonArrayLength(it.DuplicateIds) > 0), 1, 0))
                 }).MergeTable();
             switch (dto.SortField)
             {

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

@@ -201,11 +201,12 @@ namespace Hotline.Api.Controllers.Bigscreen
             EndDate = EndDate.AddDays(1).AddSeconds(-1);
              var list = await _orderRepository.Queryable(false, false, false)
                 .Where(x => x.StartTime >= StartDate && x.StartTime <= EndDate && x.AreaCode.StartsWith(AreaCode) && !x.HotspotId.StartsWith("18"))
-                .GroupBy(x => new { x.HotspotId, x.HotspotName })
+                .GroupBy(x => new { x.HotspotId, x.HotspotName,x.HotspotSpliceName })
                 .Select(x => new EarlyWarningHotsPotsStatisticsDto()
                 {
                      HotspotId = x.HotspotId,
                      HotspotName = x.HotspotName,
+                     HotspotSpliceName = x.HotspotSpliceName,
                      SumCount = SqlFunc.AggregateCount(x.Id)
                 }).OrderByDescending(x=>x.SumCount).Take(5).ToListAsync();
             return list;

src/Hotline.Api/config/appsettings.Development.json

@@ -29,7 +29,7 @@
   },
   "Swagger": true,
   "Cors": {
-    "Origins": [ "http://localhost:8888", "http://admin.hotline.fw.com", "http://localhost:80" ]
+    "Origins": [ "http://localhost:8888", "http://admin.hotline.fw.com", "http://localhost:80","http://localhost:8113" ]
   },
   "IdentityConfiguration": {
     "Password": {

src/Hotline.Api/config/appsettings.json

@@ -29,7 +29,7 @@
   },
   "Swagger": true,
   "Cors": {
-    "Origins": [ "http://localhost:8888", "http://hotline.12345lm.cn", "http://110.188.24.28:50101", "http://110.188.24.28:50102", "http://110.188.24.28:50301", "http://bs.hotline.12345lm.cn" ]
+    "Origins": [ "http://localhost:8888", "http://localhost:8113", "http://hotline.12345lm.cn", "http://110.188.24.28:50101", "http://110.188.24.28:50102", "http://110.188.24.28:50301", "http://bs.hotline.12345lm.cn" ]
   },
   "IdentityConfiguration": {
     "Password": {

src/Hotline.Application/Handlers/FlowEngine/WorkflowEndHandler.cs

@@ -157,6 +157,16 @@ public class WorkflowEndHandler : INotificationHandler<EndWorkflowNotify>
                     order.ProcessType is EProcessType.Zhiban)
                     : 0;
                 order.File(now, handleDuration, fileDuration, allDuration);
+                order.FileUserName = notification.Trace.HandlerId;
+                order.FileUserName = notification.Trace.HandlerName;
+                order.FileUserOrgId = notification.Trace.HandlerOrgId;
+                order.FileUserOrgName = notification.Trace.HandlerOrgName;
+
+                if (order.ProcessType == EProcessType.Jiaoban)
+                {
+                    order.FileUserRole = EFileUserType.Org;
+                }
+               
                 await _orderRepository.UpdateAsync(order, cancellationToken);
                 var callRecord = await _trCallRecordRepository.GetAsync(p => p.CallAccept == order.CallId, cancellationToken);
                 var orderFlowDto = new OrderFlowDto

src/Hotline.Share/Dtos/Bigscreen/BigscreenDto.cs

@@ -94,6 +94,8 @@ namespace Hotline.Share.Dtos.Bigscreen
         public string HotspotName { get; set; }
 
         public int SumCount { get; set; }
+
+        public string HotspotSpliceName { get; set; }
     }
 
     public class OrderCountStatisticsDto

src/Hotline.Share/Dtos/Order/OrderBiDto.cs

@@ -38,18 +38,37 @@ namespace Hotline.Share.Dtos.Order
 
 	public class OrderBiCentreDataListVo
 	{
+		/// <summary>
+		/// 用户名
+		/// </summary>
 		public string UserName { get; set; }
 
+		/// <summary>
+		/// 用户ID
+		/// </summary>
 		public string UserId { get; set; }
 
+		/// <summary>
+		/// 中心归档件
+		/// </summary>
 		public int CentreArchive { get; set; }
 
+		/// <summary>
+		/// 转办信件
+		/// </summary>
 		public int CentreCareOf { get; set; }
 
+		/// <summary>
+		/// 待转办
+		/// </summary>
 		public int NoCentreCareOf { get; set; }
-
+		/// <summary>
+		/// 无效件
+		/// </summary>
 		public int Invalid { get; set; }
-
+		/// <summary>
+		/// 重复件
+		/// </summary>
 		public int Repeat { get; set; }
 
         //public int Subtotal => CentreArchive + CentreCareOf + NoCentreCareOf + Invalid + Repeat;

src/Hotline.Share/Enums/Order/EFileUserType.cs

@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Hotline.Share.Enums.Order
+{
+    public enum EFileUserType
+    {
+        /// <summary>
+        /// 坐席
+        /// </summary>
+        [Description("坐席")]
+        Seat = 1,
+
+        /// <summary>
+        /// 派单员
+        /// </summary>
+        [Description("派单员")]
+        Dispatch =2,
+
+        /// <summary>
+        /// 部门
+        /// </summary>
+        [Description("部门")]
+        Org = 3,
+    }
+}

src/Hotline/Orders/Order.cs

@@ -50,7 +50,7 @@ namespace Hotline.Orders
         /// </summary>
         public string? CallId { get; set; }
 
-       
+
         /// <summary>
         /// 来电归属地
         /// </summary>
@@ -578,29 +578,29 @@ namespace Hotline.Orders
         /// </summary>
         public string? AcceptorOrgName { get; set; }
 
-		#endregion
-		#region 派单人
+        #endregion
+        #region 派单人
 
-		/// <summary>
-		/// 派单人id
-		/// </summary>
-		public string? SendOrderId { get; set; }
+        /// <summary>
+        /// 派单人id
+        /// </summary>
+        public string? SendOrderId { get; set; }
 
-		/// <summary>
-		/// 派单人名称
-		/// </summary>
-		public string? SendOrderName { get; set; }
+        /// <summary>
+        /// 派单人名称
+        /// </summary>
+        public string? SendOrderName { get; set; }
 
         /// <summary>
         /// 派单次数
         /// </summary>
         public int? SendOrderNumber { get; set; } = 0;
-		#endregion
+        #endregion
 
-		/// <summary>
-		/// 会签类型
-		/// </summary>
-		public ECounterSignType? CounterSignType { get; set; }
+        /// <summary>
+        /// 会签类型
+        /// </summary>
+        public ECounterSignType? CounterSignType { get; set; }
 
         #region 签收
 
@@ -616,6 +616,34 @@ namespace Hotline.Orders
 
         #endregion
 
+        #region 归档冗余字段
+
+        /// <summary>
+        /// 归档人名称
+        /// </summary>
+        public string? FileUserName { get; set; }
+        /// <summary>
+        /// 归档人ID
+        /// </summary>
+        public string? FileUserId { get; set; }
+
+        /// <summary>
+        /// 归档人部门Id
+        /// </summary>
+        public string? FileUserOrgId { get; set; }
+
+        /// <summary>
+        /// 归档人部门名称
+        /// </summary>
+        public string? FileUserOrgName { get; set; }
+
+        /// <summary>
+        /// 归档人类型
+        /// </summary>
+        public EFileUserType? FileUserRole{get;set;}
+
+        #endregion
+
         #endregion
 
         #region 省工单字段