完善新法规导入流程

laws-modules/src/main/java/com/jero/modules/activiti/process/ni/service/impl/ProcessNewStandardImportServiceImpl.java

@@ -18,6 +18,7 @@ import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO;
 import com.jero.modules.activiti.process.ni.entity.ProcessNewStandardImport;
 import com.jero.modules.activiti.process.ni.mapper.ProcessNewStandardImportMapper;
 import com.jero.modules.activiti.process.ni.service.IProcessNewStandardImportService;
+import com.jero.modules.activiti.process.standardComplianceCheck.entity.vo.ProcessSccVO;
 import com.jero.modules.activiti.service.ProcessAllService;
 import com.jero.modules.activiti.service.ProcessNodeLinkService;
 import com.jero.modules.sys.utils.UserUtils;
@@ -32,9 +33,8 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
-import java.util.HashMap;
+import java.lang.reflect.Array;
-import java.util.Map;
+import java.util.*;
-import java.util.Objects;
 
 import static com.jero.modules.activiti.common.ActivitiCommon.PASS;
 
@@ -86,11 +86,12 @@ public class ProcessNewStandardImportServiceImpl extends ServiceImpl<ProcessNewS
         // 业务数据
         ProcessNewStandardImport businessInfoDTO = processInfoVO.getBusinessInfoDTO();
         // 设置流程变量
-        Map<String, Object> actVariables = userInfoMap;
+        Map<String, Object> actVariables = setVariables(userInfoMap);
         // 删除草稿
         actFlowCommonService.getExistDraftAndRemove(processInfoVO.getDraftId());
         // 启动流程
         ProcessInstance processInstance = actFlowCommonService.startProcess(processDefinitionKey, actVariables);
+
         // 获取流程实例ID
         String processDefinitionId = processInstance.getProcessDefinitionId();
         String processInstanceId = processInstance.getId();
@@ -101,7 +102,7 @@ public class ProcessNewStandardImportServiceImpl extends ServiceImpl<ProcessNewS
         // 第一个节点业务数据处理
         this.startNodeBusProcess(processInfoVO);
         // 保存选人信息
-        processNodeLinkService.saveNodeUserLink(processDefinitionId, processInstanceId, this.getUserMap(userInfoMap));
+        processNodeLinkService.saveNodeUserLink(processDefinitionId, processInstanceId, userInfoMap);
         // 当前用户Id
         String userId = UserUtils.getUserId();
         // 获取第一个任务的taskId
@@ -117,6 +118,23 @@ public class ProcessNewStandardImportServiceImpl extends ServiceImpl<ProcessNewS
         actFlowCommonService.updateProcessAll(processInfo);
     }
 
+    private Map<String, Object> setVariables(Map<String, Object> userInfoMap) {
+        Map<String, Object> map = new HashMap<>();
+        // 人员信息
+        userInfoMap.forEach((key, value) -> {
+            if(Objects.equals("checkUserLeader1List",key + "List") ||
+                    Objects.equals("checkUserLeader2List",key + "List") ||
+                    Objects.equals("checkUserLeader3List",key + "List") ||
+                    Objects.equals("checkUserLeader4List",key + "List")){
+                map.put(key, value);
+                map.put(key + "List", Arrays.asList(value.toString().split(",")));
+                return;
+            }
+            map.put(key, value);
+        });
+        return map;
+    }
+
     @Override
     @Transactional(rollbackFor = JeroBootException.class)
     public void saveToDraft(ProcessInfoVO<ProcessNewStandardImport> processInfoVO) {
@@ -136,12 +154,6 @@ public class ProcessNewStandardImportServiceImpl extends ServiceImpl<ProcessNewS
         save(businessInfoDTO);
     }
 
-
-    private Map<String, Object> getUserMap(Map<String, Object> map) {
-        // TODO 转逗号拼接
-        return map;
-    }
-
     @Override
     @Transactional(rollbackFor = JeroBootException.class)
     public void approveTask(ProcessInfoVO<ProcessNewStandardImport> processInfoVO, boolean pass) {