Merge branch 'dev_dss' of Fengwo/hotline into dev

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

@@ -226,9 +226,10 @@ namespace Hotline.Api.Controllers.Bi
                     UserName = it.SignerName,
                     UserId = it.SignerId,
                     //Subtotal = SqlFunc.AggregateCount(x.AcceptorId),
-                    CentreArchive = SqlFunc.AggregateSum(SqlFunc.IIF(it.Status >= EOrderStatus.Filed && it.ProcessType == EProcessType.Zhiban, 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.FileUserRole == EFileUserType.Org || it.FileUserRole == EFileUserType.Dispatch), 1, 0)), //转办信件
+                    NoCentreCareOf = SqlFunc.AggregateSum(SqlFunc.IIF(it.Status>= EOrderStatus.WaitForAccept && it.Status< EOrderStatus.Filed && (it.FileUserRole == EFileUserType.Dispatch || it.ActualHandleStepName=="班长审批"),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(it.AcceptType == "无效", 1, 0)),
                     Repeat = SqlFunc.AggregateSum(SqlFunc.IIF(it.DuplicateIds != null && SqlFunc.JsonArrayLength(it.DuplicateIds) > 0, 1, 0)),

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

@@ -162,13 +162,20 @@ public class WorkflowEndHandler : INotificationHandler<EndWorkflowNotify>
                 order.FileUserOrgId = notification.Trace.HandlerOrgId;
                 order.FileUserOrgName = notification.Trace.HandlerOrgName;
 
+                //记录冗余归档数据
+                if(notification.Workflow.Steps.Any(x => x.BusinessType == Share.Enums.FlowEngine.EBusinessType.Send))
+                {
+                    order.FileUserRole = EFileUserType.Dispatch;
+                }
+                else
+                {
+                    order.FileUserRole = EFileUserType.Seat;
+                }
                 if (order.ProcessType == EProcessType.Jiaoban)
                 {
                     order.FileUserRole = EFileUserType.Org;
                 }
-                //TODO
-
-               
+                               
                 await _orderRepository.UpdateAsync(order, cancellationToken);
                 var callRecord = await _trCallRecordRepository.GetAsync(p => p.CallAccept == order.CallId, cancellationToken);
                 var orderFlowDto = new OrderFlowDto

src/Hotline/Permissions/EPermission.cs

@@ -55,6 +55,11 @@ namespace Hotline.Permissions
         /// </summary>
         [Display(GroupName = "工单坐席待办",Name ="工单修改",Description ="工单修改")]
         OrderEdit = 100103,
+        /// <summary>
+        /// 交办单导出
+        /// </summary>
+        [Display(GroupName ="工单坐席待办",Name ="交办单导出",Description ="交办单导出")]
+        JbdExport = 100104,
         #endregion
 
         #region 工单待办
@@ -69,6 +74,12 @@ namespace Hotline.Permissions
         /// </summary>
         [Display(GroupName = "工单待办", Name = "退回申请", Description = "退回申请")]
         ApplySendBack = 100201,
+
+        /// <summary>
+        /// 交办单导出
+        /// </summary>
+        [Display(GroupName = "工单坐席待办", Name = "交办单导出", Description = "交办单导出")]
+        ToDoOrderJbdExport = 100202,
         #endregion
 
         #region 工单受理
@@ -80,6 +91,29 @@ namespace Hotline.Permissions
 
         #endregion
 
+        #region 中心待办件
+        /// <summary>
+        /// 中心待办件
+        /// </summary>
+        [Display(GroupName ="中心待办件",Name ="中心待办件",Description ="中心待办件")]
+        CenterToDo = 100400,
+        /// <summary>
+        /// 交办单导出
+        /// </summary>
+        [Display(GroupName ="中心待办件",Name = "交办单导出",Description ="交办单导出")]
+        ToDoCenterJbdExport = 100401,
+        /// <summary>
+        /// 签收工单
+        /// </summary>
+        [Display(GroupName ="中心待办件",Name ="签收工单",Description ="签收工单")]
+        ToDoCenterSign = 100402,
+        /// <summary>
+        /// 工单修改
+        /// </summary>
+        [Display(GroupName ="中心待办件",Name ="工单修改",Description ="工单修改")]
+        ToDoCenterEdit = 100403,
+        #endregion
+
         #endregion
 
         #region 业务管理（20,00,00）
@@ -179,6 +213,11 @@ namespace Hotline.Permissions
         /// </summary>
         [Display(GroupName = "工单列表",Name ="工单签收",Description ="工单签收")]
         OrderListSign = 200115,
+        /// <summary>
+        /// 交办单导出
+        /// </summary>
+        [Display(GroupName ="工单列表",Name ="交办单导出",Description ="交办单导出")]
+        BusinessOrderJbdExport = 200116,
         #endregion
 
         #region 延期管理
@@ -320,7 +359,11 @@ namespace Hotline.Permissions
         /// </summary>
         [Display(GroupName = "特提审核", Name = "特提审核", Description = "特提审核")]
         AuditSpecial = 200404,
-
+        /// <summary>
+        /// 批量审批
+        /// </summary>
+        [Display(GroupName ="特提审核",Name ="批量审批",Description ="批量审批")]
+        BatchAuditSpecial = 200405,
 
         #endregion
 
@@ -1782,6 +1825,15 @@ namespace Hotline.Permissions
         ForceOffDuty = 800302,
         #endregion
 
+        #region 智能应答录音
+        /// <summary>
+        /// 智能应答录音
+        /// </summary>
+        [Display(GroupName = "话务管理", Name ="智能应答录音",Description ="智能应答录音")]
+        TelSmartRecord = 800400,
+
+        #endregion
+
         #endregion
 
         #region 智能化管理（90,00,00）
@@ -1945,6 +1997,11 @@ namespace Hotline.Permissions
         /// </summary>
         [Display(GroupName ="数据统计",Name ="部门受理类型统计周期",Description ="部门受理类型统计周期")]
         OrgAcceptTypeStatistics = 110213,
+        /// <summary>
+        /// 派单量统计
+        /// </summary>
+        [Display(GroupName ="数据统计",Name ="派单量统计",Description ="派单量统计")]
+        DispatchQuantityStatistics = 110214,
         #endregion
 
         #region 知识库统计（11,03,00）
@@ -2038,6 +2095,16 @@ namespace Hotline.Permissions
         [Display(GroupName = "司法行政行政监督管理",Name ="司法工单中心",Description ="司法工单中心")]
         SiFaOrderCenter = 120100,
 
+        /// <summary>
+        /// 线索核实
+        /// </summary>
+        [Display(GroupName = "司法行政行政监督管理",Name ="线索核实",Description ="线索核实")]
+        SiFaOrderVerify  = 120101,
+        /// <summary>
+        /// 线索核实（批量）
+        /// </summary>
+        [Display(GroupName ="司法行政行政监督管理",Name ="线索核实（批量）",Description ="线索核实（批量）")]
+        SiFaOrderBatichVerify = 120102,
         #endregion
 
         #region 司法数据统计
@@ -2066,6 +2133,11 @@ namespace Hotline.Permissions
         /// </summary>
         [Display(GroupName ="司法数据统计",Name ="数据大屏",Description ="数据大屏")]
         SiFaScreenData = 120204,
+        /// <summary>
+        /// 部门办件满意度
+        /// </summary>
+        [Display(GroupName ="司法数据统计",Name ="部门办件满意度",Description ="部门办件满意度")]
+        SiFaOrgVisitAndOrgSatisfactionStatistics = 120205,
         #endregion
 
 
@@ -2080,12 +2152,20 @@ namespace Hotline.Permissions
         [Display(GroupName = "公用",Name ="通知阅读",Description ="通知阅读")]
         Readed = 990101,
 
+        /// <summary>
+        /// 录音下载
+        /// </summary>
+        [Display(GroupName ="公用",Name = "录音下载", Description ="录音下载")]
+        RecordDownload = 990102,
         /// <summary>
         /// 坐席面板
         /// </summary>
         [Display(GroupName = "公用", Name = "坐席面板", Description = "坐席面板")]
         TelPanel = 990103,
 
+
+       
+
         #endregion
         
         #endregion