From 4aea7c26c69162fcc717339a5f63a3b22346324e Mon Sep 17 00:00:00 2001 From: tony <846249920@qq.com> Date: Fri, 23 Apr 2021 21:57:28 +0800 Subject: [PATCH] =?UTF-8?q?perf(=E6=9B=B4=E6=8D=A2=E8=B7=AF=E5=BE=84):=20?= =?UTF-8?q?=E6=96=B9=E4=BE=BF=E5=90=8C=E6=AD=A5=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/constant/ProcessConstants.java | 2 +- .../impl/FlowDefinitionServiceImpl.java | 24 +++++++++++++------ .../service/impl/FlowTaskServiceImpl.java | 2 +- .../survey/SurveyAnswerController.java | 2 +- .../survey/SurveyOptionsController.java | 2 +- .../survey/SurveyPaperController.java | 2 +- .../survey/SurveyQuestionController.java | 2 +- .../Process/components/nodePanel/startEnd.vue | 6 ++--- 8 files changed, 26 insertions(+), 16 deletions(-) rename {ruoyi-admin/src/main/java/com/ruoyi/web/controller => ruoyi-flowable/src/main/java/com/ruoyi/flowable}/survey/SurveyAnswerController.java (99%) rename {ruoyi-admin/src/main/java/com/ruoyi/web/controller => ruoyi-flowable/src/main/java/com/ruoyi/flowable}/survey/SurveyOptionsController.java (98%) rename {ruoyi-admin/src/main/java/com/ruoyi/web/controller => ruoyi-flowable/src/main/java/com/ruoyi/flowable}/survey/SurveyPaperController.java (98%) rename {ruoyi-admin/src/main/java/com/ruoyi/web/controller => ruoyi-flowable/src/main/java/com/ruoyi/flowable}/survey/SurveyQuestionController.java (98%) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/ProcessConstants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/ProcessConstants.java index 60448f2..0df4920 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/ProcessConstants.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/ProcessConstants.java @@ -63,7 +63,7 @@ public class ProcessConstants { /** * 初始化人员 */ - public static final String PROCESS_INITIATOR = "initiator"; + public static final String PROCESS_INITIATOR = "INITIATOR"; /** diff --git a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowDefinitionServiceImpl.java b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowDefinitionServiceImpl.java index 2ebe458..86c0be2 100644 --- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowDefinitionServiceImpl.java +++ b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowDefinitionServiceImpl.java @@ -11,6 +11,9 @@ import com.ruoyi.flowable.factory.FlowServiceFactory; import com.ruoyi.flowable.service.IFlowDefinitionService; import com.ruoyi.flowable.service.ISysDeployFormService; import com.ruoyi.system.domain.SysForm; +import com.ruoyi.system.domain.SysPost; +import com.ruoyi.system.service.ISysDeptService; +import com.ruoyi.system.service.ISysPostService; import com.ruoyi.system.service.ISysUserService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.IOUtils; @@ -23,6 +26,7 @@ import org.flowable.image.impl.DefaultProcessDiagramGenerator; import org.flowable.task.api.Task; import org.flowable.task.api.TaskQuery; import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -48,6 +52,12 @@ public class FlowDefinitionServiceImpl extends FlowServiceFactory implements IFl @Resource private ISysUserService sysUserService; + @Resource + private ISysDeptService sysDeptService; + + @Resource + private ISysPostService postService; + private static final String BPMN_FILE_SUFFIX = ".bpmn"; @Override @@ -167,18 +177,18 @@ public class FlowDefinitionServiceImpl extends FlowServiceFactory implements IFl if (Objects.nonNull(processDefinition) && processDefinition.isSuspended()) { return AjaxResult.error("流程已被挂起,请先激活流程"); } - // variables.put("skip", true); -// variables.put(ProcessConstants.FLOWABLE_SKIP_EXPRESSION_ENABLED, true); +// variables.put("skip", true); +// variables.put(ProcessConstants.FLOWABLE_SKIP_EXPRESSION_ENABLED, true); // 设置流程发起人Id到流程中 - Long userId = SecurityUtils.getLoginUser().getUser().getUserId(); - identityService.setAuthenticatedUserId(userId.toString()); - variables.put(ProcessConstants.PROCESS_INITIATOR, userId); + SysUser sysUser = SecurityUtils.getLoginUser().getUser(); + identityService.setAuthenticatedUserId(sysUser.getUserId().toString()); + variables.put(ProcessConstants.PROCESS_INITIATOR, ""); ProcessInstance processInstance = runtimeService.startProcessInstanceById(procDefId, variables); // 给第一步申请人节点设置任务执行人和意见 todo:第一个节点不设置为申请人节点有点问题？ Task task = taskService.createTaskQuery().processInstanceId(processInstance.getProcessInstanceId()).singleResult(); if (Objects.nonNull(task)) { - taskService.addComment(task.getId(), processInstance.getProcessInstanceId(), FlowComment.NORMAL.getType(), "发起流程申请"); - taskService.setAssignee(task.getId(), userId.toString()); + taskService.addComment(task.getId(), processInstance.getProcessInstanceId(), FlowComment.NORMAL.getType(), sysUser.getNickName() + "发起流程申请"); +// taskService.setAssignee(task.getId(), sysUser.getUserId().toString()); taskService.complete(task.getId(), variables); } return AjaxResult.success("流程启动成功"); diff --git a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java index db95cc3..014c3c5 100644 --- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java +++ b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java @@ -505,7 +505,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask String myTaskId = null; HistoricTaskInstance myTask = null; for (HistoricTaskInstance hti : htiList) { - if (loginUser.getUserId().toString().equals(hti.getAssignee())) { + if (StringUtils.isBlank(hti.getAssignee())) { myTaskId = hti.getId(); myTask = hti; break; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/survey/SurveyAnswerController.java b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/survey/SurveyAnswerController.java similarity index 99% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/survey/SurveyAnswerController.java rename to ruoyi-flowable/src/main/java/com/ruoyi/flowable/survey/SurveyAnswerController.java index ff1af38..6604412 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/survey/SurveyAnswerController.java +++ b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/survey/SurveyAnswerController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.survey; +package com.ruoyi.flowable.survey; import java.util.List; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/survey/SurveyOptionsController.java b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/survey/SurveyOptionsController.java similarity index 98% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/survey/SurveyOptionsController.java rename to ruoyi-flowable/src/main/java/com/ruoyi/flowable/survey/SurveyOptionsController.java index d8e2d46..9fe503a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/survey/SurveyOptionsController.java +++ b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/survey/SurveyOptionsController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.survey; +package com.ruoyi.flowable.survey; import java.util.List; import org.springframework.security.access.prepost.PreAuthorize; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/survey/SurveyPaperController.java b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/survey/SurveyPaperController.java similarity index 98% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/survey/SurveyPaperController.java rename to ruoyi-flowable/src/main/java/com/ruoyi/flowable/survey/SurveyPaperController.java index 6e9014e..91f733b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/survey/SurveyPaperController.java +++ b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/survey/SurveyPaperController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.survey; +package com.ruoyi.flowable.survey; import java.util.List; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/survey/SurveyQuestionController.java b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/survey/SurveyQuestionController.java similarity index 98% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/survey/SurveyQuestionController.java rename to ruoyi-flowable/src/main/java/com/ruoyi/flowable/survey/SurveyQuestionController.java index f8ce13e..35805f2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/survey/SurveyQuestionController.java +++ b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/survey/SurveyQuestionController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.survey; +package com.ruoyi.flowable.survey; import java.util.List; import org.springframework.security.access.prepost.PreAuthorize; diff --git a/ruoyi-ui/src/components/Process/components/nodePanel/startEnd.vue b/ruoyi-ui/src/components/Process/components/nodePanel/startEnd.vue index 4c26dcd..2740bf6 100644 --- a/ruoyi-ui/src/components/Process/components/nodePanel/startEnd.vue +++ b/ruoyi-ui/src/components/Process/components/nodePanel/startEnd.vue @@ -72,9 +72,9 @@ export default { }, watch: { 'formData.initiator': function(val) { - // if (val === '') val = null + if (val === '') val = null // 默认设置流程发起人 - if (val === '') val = 'INITIATOR' + // if (val === '') val = 'INITIATOR' this.updateProperties({ 'flowable:initiator': val }) }, 'formData.formKey': function(val) { @@ -83,7 +83,7 @@ export default { } }, created() { - this.updateProperties({ 'flowable:initiator': 'INITIATOR' }) + // this.updateProperties({ 'flowable:initiator': 'INITIATOR' }) this.formData = commonParse(this.element) } }