Merge branch 'test' into lib/test

src/Hotline.Api/Controllers/OrderController.cs

@@ -2491,6 +2491,15 @@ public class OrderController : BaseController
 
         var (total, items) = await _orderApplication.MayScreenList(dto)
             .ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);
+        var data = _mapper.Map<IReadOnlyList<OrderVisitDetailDto>>(items);
+        var isAdmin = _orderDomainService.IsCheckAdmin();
+        foreach (var item in data)
+        {
+            if (isAdmin == true)
+                item.IsShowOperate = true;
+            else
+                item.IsShowOperate = item.VisitOrgCode == _sessionContext.OrgId ? true : false;
+        }
         return new PagedDto<OrderVisitDetailDto>(total, _mapper.Map<IReadOnlyList<OrderVisitDetailDto>>(items));
     }
 
@@ -4696,9 +4705,9 @@ public class OrderController : BaseController
                     // }).Where(o => o.Id == order.Id).ExecuteCommandAsync(HttpContext.RequestAborted);
                 }
 
-                var (_, currentStep, _, _) = await _workflowDomainService.NextAsync(_sessionContext, nextDto, 
-                    expiredTime:  order.ExpiredTime,
-                    isAutoFillSummaryOpinion: isAutoFillSummaryOpinion, 
+                var (_, currentStep, _, _) = await _workflowDomainService.NextAsync(_sessionContext, nextDto,
+                    expiredTime: order.ExpiredTime,
+                    isAutoFillSummaryOpinion: isAutoFillSummaryOpinion,
                     cancellationToken: cancellationToken);
                 if (currentStep.BusinessType is EBusinessType.Send)
                 {
@@ -4738,7 +4747,7 @@ public class OrderController : BaseController
                             OrgId = unhandleStep.HandlerOrgId,
                             OrgName = unhandleStep.HandlerOrgName,
                         };
-                        var (_, _, _, nextSteps) = await _workflowDomainService.NextAsync(operater, nextflowDto, 
+                        var (_, _, _, nextSteps) = await _workflowDomainService.NextAsync(operater, nextflowDto,
                             EHandleMode.CrossLevel, order.ExpiredTime,
                             isAutoFillSummaryOpinion, cancellationToken: cancellationToken);
                         tempSteps.AddRange(nextSteps);
@@ -4795,9 +4804,9 @@ public class OrderController : BaseController
         NextWorkflowDto? flowDto, DateTime? expiredTime, bool isAutoFillSummaryOpinion, CancellationToken cancellation)
     {
         if (flowDto is null || !flowDto.NextHandlers.Any()) return;
-        var (_, _, _, currentSteps) = await _workflowDomainService.NextAsync(current, flowDto, 
+        var (_, _, _, currentSteps) = await _workflowDomainService.NextAsync(current, flowDto,
             expiredTime: expiredTime,
-            isAutoFillSummaryOpinion: isAutoFillSummaryOpinion, 
+            isAutoFillSummaryOpinion: isAutoFillSummaryOpinion,
             cancellationToken: cancellation);
 
         foreach (var currentStep in currentSteps)
@@ -5516,7 +5525,7 @@ public class OrderController : BaseController
             if (order.Workflow.IsInCountersign) throw UserFriendlyException.SameMessage("工单会签中，无法进行退回！");
 
             var (currentStep, prevStep, steps, isOrgToCenter, isSecondToFirstOrgLevel) = await _workflowApplication.GetPreviousInformationAsync(
-               dto.WorkflowId, _sessionContext.RequiredUserId, _sessionContext.RequiredOrgId, _sessionContext.Roles,dto.AssignStepId, HttpContext.RequestAborted);
+               dto.WorkflowId, _sessionContext.RequiredUserId, _sessionContext.RequiredOrgId, _sessionContext.Roles, dto.AssignStepId, HttpContext.RequestAborted);
 
             if (oneSendBack && isOrgToCenter && _appOptions.Value.IsZiGong)
             {
@@ -5598,7 +5607,7 @@ public class OrderController : BaseController
             {
                 var (currentStep, prevStep, steps, isOrgToCenter, isSecondToFirstOrgLevel) = await _workflowApplication.GetPreviousInformationAsync(
                     order.WorkflowId, sendBack.WorkflowUserId, sendBack.WorkflowOrgId, sendBack.WorkflowRoleIds.ToArray(), sendBack.AssignStepId,
-					HttpContext.RequestAborted);
+                    HttpContext.RequestAborted);
 
                 if (prevStep.BusinessType == EBusinessType.Send)
                 {
@@ -5655,7 +5664,7 @@ public class OrderController : BaseController
                 {
                     var (currentStep, prevStep, steps, isOrgToCenter, isSecondToFirstOrgLevel) = await _workflowApplication.GetPreviousInformationAsync(
                         order.WorkflowId, sendBack.WorkflowUserId, sendBack.WorkflowOrgId, sendBack.WorkflowRoleIds.ToArray(), sendBack.AssignStepId,
-						HttpContext.RequestAborted);
+                        HttpContext.RequestAborted);
                     if (prevStep.BusinessType == EBusinessType.Send)
                     {
                         // 平均派单
@@ -5776,7 +5785,7 @@ public class OrderController : BaseController
             throw UserFriendlyException.SameMessage("该工单未开启流程");
 
         var (currentStep, prevStep, steps, isOrgToCenter, isSecondToFirstOrgLevel) = await _workflowApplication.GetPreviousInformationAsync(
-            order.WorkflowId, _sessionContext.RequiredUserId, _sessionContext.RequiredOrgId, _sessionContext.Roles,string.Empty, HttpContext.RequestAborted);
+            order.WorkflowId, _sessionContext.RequiredUserId, _sessionContext.RequiredOrgId, _sessionContext.Roles, string.Empty, HttpContext.RequestAborted);
         ///查询上一节点是否是领导节点
         ///ture 流程排除领导节点 排除当前节点 prevStep.BusinessType == EBusinessType.DepartmentLeader
         if (_appOptions.Value.IsYiBin && prevStep.Name.Contains("领导"))
@@ -6095,10 +6104,10 @@ public class OrderController : BaseController
                 },
                 HttpContext.RequestAborted);
 
-   //         if (order.ActualHandleOrgCode != OrgSeedData.CenterId && order.Status < EOrderStatus.Filed)
-   //         {
-   //             await _circularRecordDomainService.OrderSpecialCircularMessage(special, order, HttpContext.RequestAborted);
-			//}
+            //         if (order.ActualHandleOrgCode != OrgSeedData.CenterId && order.Status < EOrderStatus.Filed)
+            //         {
+            //             await _circularRecordDomainService.OrderSpecialCircularMessage(special, order, HttpContext.RequestAborted);
+            //}
 
             if (string.IsNullOrEmpty(currentStep?.HandlerOrgId))
             {

src/Hotline.Application/Orders/OrderApplication.cs

@@ -61,6 +61,7 @@ using Quartz.Simpl;
 using J2N.Text;
 using Hotline.Application.FlowEngine;
 using Hotline.Article;
+using Hotline.Share.Dtos.CallCenter;
 
 namespace Hotline.Application.Orders;
 

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

@@ -982,6 +982,8 @@ namespace Hotline.Share.Dtos.Order
         /// </summary>
         public DateTime? ScreenByEndTime { get; set; }
 
+        public bool? IsShowOperate { get; set; }
+
     }
 
     /// <summary>

src/Hotline/Orders/OrderVisitDetail.cs

@@ -8,10 +8,10 @@ using XF.Utility.EnumExtensions;
 
 namespace Hotline.Orders
 {
-	[SugarIndex("index_visitDetail_creationtime", nameof(OrderVisitDetail.CreationTime), OrderByType.Desc)]
-	[SugarIndex("index_visitDetail_visitId", nameof(OrderVisitDetail.VisitId), OrderByType.Desc)]
-	[SugarIndex("index_visitDetail_visitOrgCode", nameof(OrderVisitDetail.VisitOrgCode), OrderByType.Desc)]
-	public class OrderVisitDetail : CreationEntity
+    [SugarIndex("index_visitDetail_creationtime", nameof(OrderVisitDetail.CreationTime), OrderByType.Desc)]
+    [SugarIndex("index_visitDetail_visitId", nameof(OrderVisitDetail.VisitId), OrderByType.Desc)]
+    [SugarIndex("index_visitDetail_visitOrgCode", nameof(OrderVisitDetail.VisitOrgCode), OrderByType.Desc)]
+    public class OrderVisitDetail : CreationEntity
     {
 
         /// <summary>
@@ -99,9 +99,16 @@ namespace Hotline.Orders
         /// </summary>
         public EVisitTarget VisitTarget { get; set; }
 
-		/// <summary>
-		/// 截至甄别时间
-		/// </summary>
-		public DateTime? ScreenByEndTime { get; set; }
-	}
+        /// <summary>
+        /// 截至甄别时间
+        /// </summary>
+        public DateTime? ScreenByEndTime { get; set; }
+
+        ///// <summary>
+        ///// 查询数据用
+        ///// </summary>
+        //[SugarColumn(IsIgnore = true)]
+        //public bool? IsShowOperate { get; set; }
+
+    }
 }