From e9e08ca2790c0aed50ffa99d9caa8ce31859068a Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Thu, 1 Aug 2024 14:56:26 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=A4=84=E7=90=86=E8=8A=82=E7=82=B9=E7=9A=84?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=80=BC=E6=B7=BB=E5=8A=A0=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E4=BA=BA=E7=94=A8=E6=88=B7ID=E7=9A=84?= =?UTF-8?q?=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1213546912776192]流程自动处理节点的参数值添加一个上报人用户ID的选项 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1213546912776192 --- .../process/service/ProcessTaskAutomaticServiceImpl.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/main/java/neatlogic/module/process/service/ProcessTaskAutomaticServiceImpl.java b/src/main/java/neatlogic/module/process/service/ProcessTaskAutomaticServiceImpl.java index f82af9a85..ef736a2f5 100644 --- a/src/main/java/neatlogic/module/process/service/ProcessTaskAutomaticServiceImpl.java +++ b/src/main/java/neatlogic/module/process/service/ProcessTaskAutomaticServiceImpl.java @@ -697,12 +697,9 @@ public class ProcessTaskAutomaticServiceImpl implements ProcessTaskAutomaticServ * 组装请求参数 */ private JSONObject getIntegrationParam(ProcessTaskStepVo currentProcessTaskStepVo, JSONArray paramList, JSONObject resultJson) { - JSONObject processTaskJson = ProcessTaskConditionFactory.getConditionParamData(Arrays.stream(ConditionProcessTaskOptions.values()).map(ConditionProcessTaskOptions::getValue).collect(Collectors.toList()), currentProcessTaskStepVo); -// ProcessTaskStepVo stepVo = processTaskService.getProcessTaskStepDetailInfoById(currentProcessTaskStepVo.getId()); -// ProcessTaskVo processTaskVo = processTaskService.getProcessTaskDetailById(currentProcessTaskStepVo.getProcessTaskId()); -// processTaskVo.setStartProcessTaskStep(processTaskService.getStartProcessTaskStepByProcessTaskId(processTaskVo.getId())); -// processTaskVo.setCurrentProcessTaskStep(stepVo); -// JSONObject processTaskJson = ProcessTaskUtil.getProcessFieldData(processTaskVo, true); + List processTaskParams = Arrays.stream(ProcessTaskParams.values()).map(ProcessTaskParams::getValue).collect(Collectors.toList()); + JSONObject processTaskJson = ProcessTaskConditionFactory.getConditionParamData(processTaskParams, currentProcessTaskStepVo); + System.out.println("processTaskJson = " + processTaskJson); JSONObject integrationParam = new JSONObject(); if (CollectionUtils.isNotEmpty(paramList)) { for (Object paramObj : paramList) { -- Gitee From ee7d2d7c8ccdd52181844a6f39aa177ea7e1b404 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Thu, 1 Aug 2024 14:57:58 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=A4=84=E7=90=86=E8=8A=82=E7=82=B9=E7=9A=84?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=80=BC=E6=B7=BB=E5=8A=A0=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E4=BA=BA=E7=94=A8=E6=88=B7ID=E7=9A=84?= =?UTF-8?q?=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1213546912776192]流程自动处理节点的参数值添加一个上报人用户ID的选项 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1213546912776192 --- .../module/process/service/ProcessTaskAutomaticServiceImpl.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/neatlogic/module/process/service/ProcessTaskAutomaticServiceImpl.java b/src/main/java/neatlogic/module/process/service/ProcessTaskAutomaticServiceImpl.java index ef736a2f5..bb8127796 100644 --- a/src/main/java/neatlogic/module/process/service/ProcessTaskAutomaticServiceImpl.java +++ b/src/main/java/neatlogic/module/process/service/ProcessTaskAutomaticServiceImpl.java @@ -699,7 +699,6 @@ public class ProcessTaskAutomaticServiceImpl implements ProcessTaskAutomaticServ private JSONObject getIntegrationParam(ProcessTaskStepVo currentProcessTaskStepVo, JSONArray paramList, JSONObject resultJson) { List processTaskParams = Arrays.stream(ProcessTaskParams.values()).map(ProcessTaskParams::getValue).collect(Collectors.toList()); JSONObject processTaskJson = ProcessTaskConditionFactory.getConditionParamData(processTaskParams, currentProcessTaskStepVo); - System.out.println("processTaskJson = " + processTaskJson); JSONObject integrationParam = new JSONObject(); if (CollectionUtils.isNotEmpty(paramList)) { for (Object paramObj : paramList) { -- Gitee