diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/service/impl/ProcessNewStandardImportServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/service/impl/ProcessNewStandardImportServiceImpl.java index cb6b097f..54dc481a 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/service/impl/ProcessNewStandardImportServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/service/impl/ProcessNewStandardImportServiceImpl.java @@ -23,6 +23,7 @@ import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.runtime.ProcessInstance; import org.activiti.engine.task.Task; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; @@ -56,6 +57,7 @@ public class ProcessNewStandardImportServiceImpl extends ServiceImpl processInfoVO) { // 流程Key String processDefinitionKey = ProcessType.NEW_STANDARD_IMPORT.getProcessKey(); @@ -67,10 +69,8 @@ public class ProcessNewStandardImportServiceImpl extends ServiceImpl userInfoMap = processInfoVO.getUserInfoMap(); // 业务数据 ProcessNewStandardImport businessInfoDTO = processInfoVO.getBusinessInfoDTO(); - // 当前用户Id - String userId = UserUtils.getUserId(); // 设置流程变量 - Map actVariables = this.setVariables(businessInfoDTO); + Map actVariables = userInfoMap; // 删除草稿 actFlowCommonService.getExistDraftAndRemove(processInfoVO.getDraftId()); // 启动流程 @@ -82,10 +82,12 @@ public class ProcessNewStandardImportServiceImpl extends ServiceImpl setVariables(ProcessNewStandardImport businessInfoDTO) { - // TODO 转List - return new HashMap<>(); - } private Map getUserMap(Map map) { // TODO 转逗号拼接 diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/entity/vo/ProcessNewStandardImportVO.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/vo/ProcessNewStandardImportVO.java similarity index 77% rename from laws-modules/src/main/java/com/jero/modules/activiti/process/ni/entity/vo/ProcessNewStandardImportVO.java rename to laws-modules/src/main/java/com/jero/modules/activiti/process/ni/vo/ProcessNewStandardImportVO.java index 5e3fd99d..8df4f168 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/entity/vo/ProcessNewStandardImportVO.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/vo/ProcessNewStandardImportVO.java @@ -1,4 +1,4 @@ -package com.jero.modules.activiti.process.ni.entity.vo; +package com.jero.modules.activiti.process.ni.vo; import com.jero.modules.activiti.process.ni.entity.ProcessNewStandardImport;