整合spring依赖冲突

src/main/java/com/qs/serve/modules/bpm/conf/FlowServiceFactory.java

@@ -29,7 +29,7 @@ public class FlowServiceFactory {
     protected TaskService taskService;
 
     @Resource
-    protected BpmFormService formService;
+    protected BpmFormService bpmFormService;
 
     @Resource
     protected HistoryService historyService;

src/main/java/com/qs/serve/modules/bpm/controller/BpmDeployFormController.java

@@ -19,7 +19,7 @@ import javax.validation.Valid;
 import java.util.List;
 
 /**
- * 工作流 部署表单关联 后台接口
+ * 工作流 部署表单关联
  * @author YenHex
  * @since 2022-08-23
  */

src/main/java/com/qs/serve/modules/bpm/entity/BpmForm.java

@@ -38,6 +38,10 @@ public class BpmForm implements Serializable {
     @NotNull(message = "表单内容不能为空")
     private String formContext;
 
+    /** 版本 */
+    @NotNull(message = "表单内容不能为空")
+    private Integer version;
+
     /** 备注 */
     @Length(max = 255,message = "备注长度不能超过255字")
     private String remark;

src/main/java/com/qs/serve/modules/bpm/service/impl/BpmFormServiceImpl.java

@@ -14,7 +14,7 @@ import com.qs.serve.modules.bpm.mapper.BpmFormMapper;
  * @since 2022-08-18
  */
 @Slf4j
-@Service
+@Service("bpmFormServiceImpl")
 @AllArgsConstructor
 public class BpmFormServiceImpl extends ServiceImpl<BpmFormMapper,BpmForm> implements BpmFormService {
 

src/main/java/com/qs/serve/modules/bpm/service/impl/IFlowDefinitionServiceImpl.java

@@ -1,6 +1,7 @@
 package com.qs.serve.modules.bpm.service.impl;
 
 import com.qs.serve.common.util.Assert;
+import com.qs.serve.common.util.AuthContextUtils;
 import com.qs.serve.modules.bpm.common.consts.ProcessConstants;
 import com.qs.serve.modules.bpm.common.enums.FlowComment;
 import com.qs.serve.modules.bpm.conf.FlowServiceFactory;
@@ -59,7 +60,7 @@ public class IFlowDefinitionServiceImpl extends FlowServiceFactory implements IF
         // 给第一步申请人节点设置任务执行人和意见 todo:第一个节点不设置为申请人节点有点问题？
         Task task = taskService.createTaskQuery().processInstanceId(processInstance.getProcessInstanceId()).singleResult();
         if (Objects.nonNull(task)) {
-            taskService.addComment(task.getId(), processInstance.getProcessInstanceId(), FlowComment.NORMAL.getType(),  "sysUser.getNickName()发起流程申请");
+            taskService.addComment(task.getId(), processInstance.getProcessInstanceId(), FlowComment.NORMAL.getType(),  AuthContextUtils.getLoginUser().getNick() +"发起流程申请");
 //                taskService.setAssignee(task.getId(), sysUser.getUserId().toString());
             taskService.complete(task.getId(), variables);
         }

src/main/java/com/qs/serve/modules/bpm/service/impl/IFlowInstanceServiceImpl.java

@@ -38,7 +38,8 @@ public class IFlowInstanceServiceImpl extends FlowServiceFactory implements IFlo
     @Override
     public void stopProcessInstance(FlowTaskVo vo) {
         String taskId = vo.getTaskId();
-        //结束流程实例
+        //TODO 结束流程实例
+
     }
 
     /**
@@ -109,8 +110,8 @@ public class IFlowInstanceServiceImpl extends FlowServiceFactory implements IFlo
             runtimeService.startProcessInstanceById(procDefId, variables);
         } catch (Exception e) {
             e.printStackTrace();
-        }
             Assert.throwEx("启动流程失败");
         }
+    }
 
 }