Merge branch 'master' of http://git.12345lm.cn/Fengwo/hotline

src/Hotline.Ai.Jths/AiQualityService.cs

@@ -25,7 +25,8 @@ namespace Hotline.Ai.Jths
         public async Task CreateAiOrderQualityTask(Hotline.Quality.Quality model, TrCallRecord call, Order order, CancellationToken cancellationToken)
 		{
 			var fileName = call.RecordingFileName.Split(".");
-			var recordForm = fileName.Any() && fileName.Length > 1 ? fileName[1] : string.Empty;
+			var length = fileName.Count() -1;
+			var recordForm = fileName.Any() && fileName.Length > 1 ? fileName[length] : string.Empty;
 			List<AiQualityDto> datalist = new List<AiQualityDto>();
 			AiQualityDto aiQuality = new AiQualityDto
 			{

src/Hotline.Application/Quality/QualityApplication.cs

@@ -93,7 +93,7 @@ namespace Hotline.Application.Quality
                 var teAny = await _qualityTemplate.Queryable()
                     .LeftJoin<QualityTemplateDetail>((x, d) => x.Id == d.TemplateId)
                     .LeftJoin<QualityItem>((x, d, i) => d.ItemId == i.Id)
-                    .Where((x, d, i) => i.IsIntelligent == 1).AnyAsync();
+                    .Where((x, d, i) => i.IsIntelligent == 1).Where((x,d,i)=>x.Grouping == ETemplateGrouping.Accepted).AnyAsync();
                 if (teAny)
                 {
 					var order = await _orderRepository.GetAsync(model.OrderId);

src/Hotline/FlowEngine/Workflows/IWorkflowDomainService.cs

@@ -54,7 +54,7 @@ namespace Hotline.FlowEngine.Workflows
 		/// 退回（返回前一节点）
 		/// </summary>
 		/// <returns></returns>
-        Task PreviousAsync(Workflow workflow, PreviousWorkflowDto dto, User user, CancellationToken cancellationToken);
+        Task PreviousAsync(Workflow workflow, PreviousWorkflowDto dto, User operater, CancellationToken cancellationToken);
 
         /// <summary>
         /// 撤回（返回到之前任意节点）

src/Hotline/FlowEngine/Workflows/WorkflowDomainService.cs

@@ -459,14 +459,14 @@ namespace Hotline.FlowEngine.Workflows
         /// 退回（返回前一节点）
         /// </summary>
         /// <returns></returns>
-        public async Task PreviousAsync(Workflow workflow, PreviousWorkflowDto dto, User user, CancellationToken cancellationToken)
+        public async Task PreviousAsync(Workflow workflow, PreviousWorkflowDto dto, User operater, CancellationToken cancellationToken)
         {
-            ValidatePermission(workflow, user.OrgId, user.Id);
+            ValidatePermission(workflow, operater.OrgId, operater.Id);
             CheckWhetherRunnable(workflow.Status);
             if (workflow.IsInCountersign)
                 throw UserFriendlyException.SameMessage("会签流程不支持退回");
 
-            var currentStep = GetUnHandleStep(workflow.Steps, user.OrgId, user.Id);
+            var currentStep = GetUnHandleStep(workflow.Steps, operater.OrgId, operater.Id);
 
             if (workflow.FlowType is EFlowType.Review && currentStep.StepType is EStepType.Start && currentStep.IsOrigin)
                 throw UserFriendlyException.SameMessage("当前流程已退回到开始节点");
@@ -495,13 +495,13 @@ namespace Hotline.FlowEngine.Workflows
 
             //更新当前办理节点信息
             workflow.UpdateWorkflowCurrentStepInfo(false,
-                user.Id, user.Name,
-                user.Organization.Id, user.Organization.Name,
-                user.Organization.AreaCode, user.Organization.AreaName,
+                operater.Id, operater.Name,
+                operater.OrgId, operater.Organization.Name,
+                operater.Organization.AreaCode, operater.Organization.AreaName,
                 nextStep: newPrevStep);
 
             //更新流程可办理对象
-            workflow.UpdatePreviousHandlers(user.Id, user.OrgId, newPrevStep);
+            workflow.UpdatePreviousHandlers(operater.Id, operater.OrgId, newPrevStep);
 
             //orgToCenter会触发重新计算期满时间，1.无需审核按当前时间进行计算 2.需审核按审核通过时间计算
             var isOrgToCenter = prevStep.BusinessType is EBusinessType.Send && prevStep.IsOrigin;