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 3b3541b9..13722e42 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 @@ -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.util.Map; -import java.util.Objects; +import java.lang.reflect.Array; +import java.util.*; import static com.jero.modules.activiti.common.ActivitiCommon.PASS; @@ -86,11 +86,12 @@ public class ProcessNewStandardImportServiceImpl extends ServiceImpl actVariables = userInfoMap; + Map 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 setVariables(Map userInfoMap) { + Map 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 processInfoVO) { @@ -136,12 +154,6 @@ public class ProcessNewStandardImportServiceImpl extends ServiceImpl getUserMap(Map map) { - // TODO 转逗号拼接 - return map; - } - @Override @Transactional(rollbackFor = JeroBootException.class) public void approveTask(ProcessInfoVO processInfoVO, boolean pass) {