diff --git a/src/main/java/neatlogic/module/autoexec/process/util/CreateJobConfigUtil.java b/src/main/java/neatlogic/module/autoexec/process/util/CreateJobConfigUtil.java index 73e979a7f5b55b2f7b98b47c6ab94effa7fadbff..06de932bc9f08498520339ab74a6b49c4de938d7 100644 --- a/src/main/java/neatlogic/module/autoexec/process/util/CreateJobConfigUtil.java +++ b/src/main/java/neatlogic/module/autoexec/process/util/CreateJobConfigUtil.java @@ -234,33 +234,19 @@ public class CreateJobConfigUtil { if (needExecuteNode) { String whenToSpecify = combopExecuteConfig.getWhenToSpecify(); if (Objects.equals(CombopNodeSpecify.NOW.getValue(), whenToSpecify)) { + executeConfig.setWhenToSpecify(CombopNodeSpecify.NOW.getValue()); AutoexecCombopExecuteNodeConfigVo executeNodeConfig = combopExecuteConfig.getExecuteNodeConfig(); if (executeNodeConfig != null) { executeConfig.setExecuteNodeConfig(executeNodeConfig); } } else if (Objects.equals(CombopNodeSpecify.RUNTIMEPARAM.getValue(), whenToSpecify)) { + executeConfig.setWhenToSpecify(CombopNodeSpecify.RUNTIMEPARAM.getValue()); AutoexecCombopExecuteNodeConfigVo executeNodeConfig = combopExecuteConfig.getExecuteNodeConfig(); if (executeNodeConfig != null) { executeConfig.setExecuteNodeConfig(executeNodeConfig); -// List paramList = executeNodeConfig.getParamList(); -// if (CollectionUtils.isNotEmpty(paramList)) { -// List inputNodeList = new ArrayList<>(); -// JSONObject paramObj = jobVo.getParam(); -// for (String paramKey : paramList) { -// JSONArray jsonArray = paramObj.getJSONArray(paramKey); -// if (CollectionUtils.isNotEmpty(jsonArray)) { -// List list = jsonArray.toJavaList(AutoexecNodeVo.class); -// inputNodeList.addAll(list); -// } -// } -// if (CollectionUtils.isNotEmpty(inputNodeList)) { -// AutoexecCombopExecuteNodeConfigVo executeNodeConfigVo = new AutoexecCombopExecuteNodeConfigVo(); -// executeNodeConfigVo.setInputNodeList(inputNodeList); -// executeConfig.setExecuteNodeConfig(executeNodeConfigVo); -// } -// } } } else if (Objects.equals(CombopNodeSpecify.RUNTIME.getValue(), whenToSpecify)) { + executeConfig.setWhenToSpecify(CombopNodeSpecify.RUNTIME.getValue()); CreateJobConfigMappingGroupVo mappingGroupVo = executeParamMappingGroupMap.get("executeNodeConfig"); if (mappingGroupVo != null) { JSONArray jsonArray = parseCreateJobConfigMappingGroup(mappingGroupVo, formAttributeList, originalFormAttributeDataMap, formAttributeDataMap, processTaskParam); @@ -268,12 +254,6 @@ public class CreateJobConfigUtil { if (executeNodeConfigVo != null) { executeConfig.setExecuteNodeConfig(executeNodeConfigVo); } -// List inputNodeList = getInputNodeList(jsonArray); -// if (CollectionUtils.isNotEmpty(inputNodeList)) { -// AutoexecCombopExecuteNodeConfigVo executeNodeConfigVo = new AutoexecCombopExecuteNodeConfigVo(); -// executeNodeConfigVo.setInputNodeList(inputNodeList); -// executeConfig.setExecuteNodeConfig(executeNodeConfigVo); -// } } } } @@ -1073,7 +1053,10 @@ public class CreateJobConfigUtil { } else if (Objects.equals(paramType, ParamType.CHECKBOX.getValue())) { return getObjectList(jsonArray); } else if (Objects.equals(paramType, ParamType.NODE.getValue())) { - return getInputNodeList(jsonArray); + List list = getInputNodeList(jsonArray); + JSONArray array = new JSONArray(list.size()); + array.addAll(list); + return array; } else if (Objects.equals(paramType, ParamType.ACCOUNT.getValue())) { // 账号id,单选 return getAccountId(jsonArray);