完善新法规清单导入流程

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<ProcessNewS
     private RuntimeService runtimeService;
 
     @Override
+    @Transactional(rollbackFor = JeroBootException.class)
     public void startProcess(ProcessInfoVO<ProcessNewStandardImport> processInfoVO) {
         // 流程Key
         String processDefinitionKey = ProcessType.NEW_STANDARD_IMPORT.getProcessKey();
@@ -67,10 +69,8 @@ public class ProcessNewStandardImportServiceImpl extends ServiceImpl<ProcessNewS
         Map<String, Object> userInfoMap = processInfoVO.getUserInfoMap();
         // 业务数据
         ProcessNewStandardImport businessInfoDTO = processInfoVO.getBusinessInfoDTO();
-        // 当前用户Id
-        String userId = UserUtils.getUserId();
         // 设置流程变量
-        Map<String, Object> actVariables = this.setVariables(businessInfoDTO);
+        Map<String, Object> actVariables = userInfoMap;
         // 删除草稿
         actFlowCommonService.getExistDraftAndRemove(processInfoVO.getDraftId());
         // 启动流程
@@ -82,10 +82,12 @@ public class ProcessNewStandardImportServiceImpl extends ServiceImpl<ProcessNewS
         processInfo.setProcessInstanceId(processInstanceId);
         processInfo.setProcessDefinitionId(processDefinitionId);
         processInfo.setProcessType(ProcessTypeEnum.NEW_STANDARD_IMPORT.getValue());
-        // 第一个节点业务数据处理 返回流程名称
+        // 第一个节点业务数据处理
         this.startNodeBusProcess(processInfoVO);
         // 保存选人信息
         processNodeLinkService.saveNodeUserLink(processDefinitionId, processInstanceId, this.getUserMap(userInfoMap));
+        // 当前用户Id
+        String userId = UserUtils.getUserId();
         // 获取第一个任务的taskId
         String taskId = actFlowCommonService.getFirstTaskId(processInstanceId, userId, processDefinitionId);
         // 保存第一个节点的草稿
@@ -107,10 +109,6 @@ public class ProcessNewStandardImportServiceImpl extends ServiceImpl<ProcessNewS
         save(businessInfoDTO);
     }
 
-    private Map<String, Object> setVariables(ProcessNewStandardImport businessInfoDTO) {
-        // TODO 转List
-        return new HashMap<>();
-    }
 
     private Map<String, Object> getUserMap(Map<String, Object> map) {
         // TODO 转逗号拼接

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;