Merge branch 'master' of http://110.188.24.182:10023/Fengwo/hotline

src/Hotline.Api/Controllers/WorkflowController.cs

@@ -23,9 +23,6 @@ using Hotline.Caching.Interfaces;
 using Hotline.File;
 using Hotline.Orders;
 using Hotline.Share.Dtos.Order;
-using Mapster;
-using Hotline.Repository.SqlSugar.File;
-using Hotline.Share.Dtos.File;
 using Hotline.Share.Dtos.FlowEngine.Definition;
 
 namespace Hotline.Api.Controllers;

src/Hotline.Api/config/appsettings.json

@@ -111,8 +111,8 @@
     "RuleUid": "MTAwMDAxSGdDJryoQUgoDeiKlsTEyc", //现有规则ID
     "VisitFromNameKey": "OC_SCENE_VAR_FIELD11", //来电名称       //开发环境 :OC_SCENE_VAR_FIELD11   //生产环境：OC_SCENE_VAR_FIELD12
     "VisitFromGenderKey": "OC_SCENE_VAR_FIELD14", //来电性别     //开发环境: OC_SCENE_VAR_FIELD14   //生产环境：OC_SCENE_VAR_FIELD14
-    "VisitCreationTimeKey": "OC_SCENE_VAR_FIELD19", //来电时间   //开发环境:OC_SCENE_VAR_FIELD17    //生产环境：OC_SCENE_VAR_FIELD19
-    "VisitOrderTitleKey": "OC_SCENE_VAR_FIELD20" //工单标题      //开发环境:OC_SCENE_VAR_FIELD18    //生产环境：OC_SCENE_VAR_FIELD20
+    "VisitCreationTimeKey": "OC_SCENE_VAR_FIELD17", //来电时间   //开发环境:OC_SCENE_VAR_FIELD17    //生产环境：OC_SCENE_VAR_FIELD19
+    "VisitOrderTitleKey": "OC_SCENE_VAR_FIELD18" //工单标题      //开发环境:OC_SCENE_VAR_FIELD18    //生产环境：OC_SCENE_VAR_FIELD20
   },
   //企业服务
   "Enterprise": {

src/Hotline.Application/FlowEngine/WorkflowApplication.cs

@@ -176,7 +176,13 @@ public class WorkflowApplication : IWorkflowApplication, IScopeDependency
         await _workflowTraceRepository.AddAsync(startTrace, cancellationToken);
         workflow.Traces.Add(startTrace);
 
-
+        //更新受理人信息
+        workflow.UpdateAcceptor(
+            _sessionContext.RequiredUserId,
+            _sessionContext.UserName,
+            _sessionContext.StaffNo,
+            _sessionContext.RequiredOrgId,
+            _sessionContext.OrgName);
 
         await _workflowDomainService.StartAsync(workflow, startStep, dto, firstStepDefine, isNextDynamic,
             flowAssignInfo, counterSignType, cancellationToken);

src/Hotline/FlowEngine/Workflows/WorkflowDomainService.cs

@@ -181,14 +181,6 @@ namespace Hotline.FlowEngine.Workflows
             //    _sessionContext.OrgAreaCode, _sessionContext.OrgAreaName,
             //    _sessionContext.OrgLevel);
 
-            //更新受理人信息
-            workflow.UpdateAcceptor(
-                _sessionContext.RequiredUserId,
-                _sessionContext.UserName,
-                _sessionContext.StaffNo,
-                _sessionContext.RequiredOrgId,
-                _sessionContext.OrgName);
-
             workflow.UpdateHandlers(_sessionContext.RequiredUserId, _sessionContext.RequiredOrgId,
                 flowAssignInfo.FlowAssignType, flowAssignInfo.HandlerObjects, true);