From a0a00c615805810f90646236da994dd6817fb6a0 Mon Sep 17 00:00:00 2001 From: Yen Date: Tue, 6 Sep 2022 14:55:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E5=90=88spring=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/qs/serve/modules/bpm/conf/FlowServiceFactory.java | 2 +- .../modules/bpm/controller/BpmDeployFormController.java | 2 +- src/main/java/com/qs/serve/modules/bpm/entity/BpmForm.java | 4 ++++ .../serve/modules/bpm/service/impl/BpmFormServiceImpl.java | 2 +- .../modules/bpm/service/impl/IFlowDefinitionServiceImpl.java | 3 ++- .../modules/bpm/service/impl/IFlowInstanceServiceImpl.java | 5 +++-- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/bpm/conf/FlowServiceFactory.java b/src/main/java/com/qs/serve/modules/bpm/conf/FlowServiceFactory.java index 6078bc2..4eb6a14 100644 --- a/src/main/java/com/qs/serve/modules/bpm/conf/FlowServiceFactory.java +++ b/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; diff --git a/src/main/java/com/qs/serve/modules/bpm/controller/BpmDeployFormController.java b/src/main/java/com/qs/serve/modules/bpm/controller/BpmDeployFormController.java index 1f40587..c6a331f 100644 --- a/src/main/java/com/qs/serve/modules/bpm/controller/BpmDeployFormController.java +++ b/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 */ diff --git a/src/main/java/com/qs/serve/modules/bpm/entity/BpmForm.java b/src/main/java/com/qs/serve/modules/bpm/entity/BpmForm.java index 5236814..3745455 100644 --- a/src/main/java/com/qs/serve/modules/bpm/entity/BpmForm.java +++ b/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; diff --git a/src/main/java/com/qs/serve/modules/bpm/service/impl/BpmFormServiceImpl.java b/src/main/java/com/qs/serve/modules/bpm/service/impl/BpmFormServiceImpl.java index 1c8e61f..f09135d 100644 --- a/src/main/java/com/qs/serve/modules/bpm/service/impl/BpmFormServiceImpl.java +++ b/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 implements BpmFormService { diff --git a/src/main/java/com/qs/serve/modules/bpm/service/impl/IFlowDefinitionServiceImpl.java b/src/main/java/com/qs/serve/modules/bpm/service/impl/IFlowDefinitionServiceImpl.java index 8390165..0c563ef 100644 --- a/src/main/java/com/qs/serve/modules/bpm/service/impl/IFlowDefinitionServiceImpl.java +++ b/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); } diff --git a/src/main/java/com/qs/serve/modules/bpm/service/impl/IFlowInstanceServiceImpl.java b/src/main/java/com/qs/serve/modules/bpm/service/impl/IFlowInstanceServiceImpl.java index 3bb760f..30dcae8 100644 --- a/src/main/java/com/qs/serve/modules/bpm/service/impl/IFlowInstanceServiceImpl.java +++ b/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("启动流程失败"); } - Assert.throwEx("启动流程失败"); } }