Browse Source

优化扩展实例判断流程类型

hubin 1 year ago
parent
commit
72399c6159

+ 12 - 7
src/main/java/com/aizuda/boot/modules/flw/service/impl/ProcessTaskServiceImpl.java

@@ -10,12 +10,18 @@ import com.aizuda.boot.modules.flw.flow.FlowForm;
 import com.aizuda.boot.modules.flw.flow.FlowHelper;
 import com.aizuda.boot.modules.flw.mapper.FlowlongMapper;
 import com.aizuda.boot.modules.flw.service.*;
-import com.aizuda.bpm.engine.*;
+import com.aizuda.bpm.engine.FlowDataTransfer;
+import com.aizuda.bpm.engine.FlowLongEngine;
+import com.aizuda.bpm.engine.RuntimeService;
+import com.aizuda.bpm.engine.TaskService;
 import com.aizuda.bpm.engine.core.FlowCreator;
 import com.aizuda.bpm.engine.core.enums.PerformType;
 import com.aizuda.bpm.engine.core.enums.ProcessType;
 import com.aizuda.bpm.engine.core.enums.TaskType;
-import com.aizuda.bpm.engine.entity.*;
+import com.aizuda.bpm.engine.entity.FlwExtInstance;
+import com.aizuda.bpm.engine.entity.FlwHisInstance;
+import com.aizuda.bpm.engine.entity.FlwInstance;
+import com.aizuda.bpm.engine.entity.FlwTask;
 import com.aizuda.bpm.engine.model.ModelHelper;
 import com.aizuda.bpm.engine.model.NodeModel;
 import com.aizuda.bpm.engine.model.ProcessModel;
@@ -97,13 +103,13 @@ public class ProcessTaskServiceImpl implements IProcessTaskService {
         vo.setCreateTime(hisInstance.getCreateTime());
 
         // 获取当前流程模型
-        FlwExtInstance flwExtInstance = extInstanceMapper.selectById(instanceId);
-        vo.setModelContent(flwExtInstance.getModelContent());
+        FlwExtInstance extInstance = extInstanceMapper.selectById(instanceId);
+        vo.setModelContent(extInstance.getModelContent());
 
         // 表单配置权限
         if (null != dto.getTaskId()) {
             FlwTask flwTask = this.getFlwTask(dto.getTaskId());
-            ProcessModel processModel = flwExtInstance.model();
+            ProcessModel processModel = extInstance.model();
             NodeModel nodeModel = processModel.getNode(flwTask.getTaskKey());
             Map<String, Object> extendConfig = nodeModel.getExtendConfig();
             if (null != extendConfig) {
@@ -127,8 +133,7 @@ public class ProcessTaskServiceImpl implements IProcessTaskService {
             vo.setProcessSetting(configure.getProcessSetting());
 
             // 表单设置
-            FlwProcess flwProcess = flowLongEngine.processService().getProcessById(hisInstance.getProcessId());
-            if (ProcessType.business.eq(flwProcess.getProcessType())) {
+            if (ProcessType.business.eq(extInstance.getProcessType())) {
                 // 业务流程,加载表单模板内容
                 vo.setFormTemplate(flwFormTemplateService.getByConfigure(configure.getProcessForm()));
             } else {