From 600da3eb8f50ddf171490160ab42ea41e9750ed0 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Tue, 2 Jul 2024 17:22:28 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E5=A4=84=E7=90=86-=E5=88=9B=E5=BB=BA=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E8=8A=82=E7=82=B9=EF=BC=8C=E8=A1=A8=E5=8D=95=E6=98=A0=E5=B0=84?= =?UTF-8?q?=E8=8A=82=E7=82=B9=E7=B1=BB=E5=9E=8B=E7=9A=84=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1191280862789632]工单处理-创建作业节点，表单映射节点类型的作业参数异常 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1191280862789632 --- .../process/util/CreateJobConfigUtil.java | 31 +++++-------------- 1 file changed, 7 insertions(+), 24 deletions(-) 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 73e979a7..06de932b 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); -- Gitee