diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/enums/ProcessType.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/enums/ProcessType.java index 1b384be0..c4c3854c 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/enums/ProcessType.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/enums/ProcessType.java @@ -11,18 +11,20 @@ public enum ProcessType { /** * 企标立项变更 */ - ES_INIT_CHANGE("企标立项/变更计划", "1", "es-init-change"), + ES_INIT_CHANGE("企标立项/变更计划", "1", "es-init-change", "processEsInitChangeServiceImpl"), ; private final String name; private final String value; private final String processKey; + private final String serviceClassName; - ProcessType(String name, String value, String processKey) { + ProcessType(String name, String value, String processKey, String serviceClassName) { this.name = name; this.value = value; this.processKey = processKey; + this.serviceClassName = serviceClassName; } public String getProcessTypeNameByProcessKey(String processKey) { @@ -45,6 +47,9 @@ public enum ProcessType { public String getProcessKey() { return processKey; } + + public String getServiceClassName() { + return serviceClassName;} } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java index 69ebc584..674a1233 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java @@ -57,7 +57,6 @@ public class ActFlowCommonService { Map variables = customService.setVariables(businessId); // 第一个节点默认通过 variables.put("pass", true); - variables.put("createUser", UserUtils.getUserId()); // 启动流程 ProcessInstance processInstance = runtimeService.startProcessInstanceById(latestProcessDefinition.getId(), variables); // 流程实例ID diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java index 9192db3a..ce41888c 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.exception.JeroBootException; import com.jero.modules.activiti.process.common.entity.ProcessDraft; +import com.jero.modules.activiti.process.common.enums.ProcessType; import com.jero.modules.activiti.process.common.service.ActFlowCommonService; import com.jero.modules.activiti.process.common.service.IActFlowCustomService; import com.jero.modules.activiti.process.common.service.ProcessDraftService; @@ -54,6 +55,7 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl setVariables(ProcessEsInitChange initChange) { Map map = new HashMap<>(); // 设置流程中各个节点的人 + map.put("draftUser", UserUtils.getUserIdByUserName(initChange.getCreateBy())); map.put("contactUser", initChange.getContactUser()); map.put("standardExpertList", Optional.ofNullable(initChange.getStandardExpert()).map(s -> Arrays.asList(s.split(","))).orElse(Collections.emptyList())); map.put("mainDraftUserLeader", initChange.getMainDraftUserLeader()); @@ -86,14 +88,14 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl map : taskList) { if (map.get("assignee").toString().equals(userId) && map.get("processDefinitionId").toString().equals(processDefinitionId)) { - log.info("当前用户ID:{},相关联的流程定义ID:{}", userId, map.get("processDefinitionId").toString()); log.info("匹配到的任务ID:{}", map.get("taskId").toString()); - actFlowCommonService.completeTask("同意", map.get("taskId").toString(), userId, map); } } diff --git a/laws-modules/src/main/java/com/jero/modules/sys/utils/UserUtils.java b/laws-modules/src/main/java/com/jero/modules/sys/utils/UserUtils.java index dd48a0c2..40883a43 100644 --- a/laws-modules/src/main/java/com/jero/modules/sys/utils/UserUtils.java +++ b/laws-modules/src/main/java/com/jero/modules/sys/utils/UserUtils.java @@ -17,4 +17,9 @@ public class UserUtils { public static LoginUser getCurrentUser() { return (LoginUser) SecurityUtils.getSubject().getPrincipal(); } + + public static String getUserIdByUserName(String createBy) { + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + return sysUser.getUsername(); + } }