From 30aeeb89dfc82df126d52ecfe6300f2356a3cd0b Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Wed, 19 Jun 2024 20:28:05 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=90=8E=E7=AB=AF-?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=96=B0=E5=A2=9E=E6=95=B0=E6=8D=AE=E8=BD=AC?= =?UTF-8?q?=E6=8D=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #[1181253229838336]后端-表单新增数据转换功能 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1181253229838336 --- .../stephandler/component/AutoexecProcessComponent.java | 9 ++++++--- .../utilhandler/AutoexecProcessUtilHandler.java | 5 +++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/main/java/neatlogic/module/autoexec/stephandler/component/AutoexecProcessComponent.java b/src/main/java/neatlogic/module/autoexec/stephandler/component/AutoexecProcessComponent.java index 0c62deb0..0bad7383 100644 --- a/src/main/java/neatlogic/module/autoexec/stephandler/component/AutoexecProcessComponent.java +++ b/src/main/java/neatlogic/module/autoexec/stephandler/component/AutoexecProcessComponent.java @@ -84,7 +84,7 @@ public class AutoexecProcessComponent extends ProcessStepHandlerBase { private final static Logger logger = LoggerFactory.getLogger(AutoexecProcessComponent.class); - private final String FORM_EXTEND_ATTRIBUTE_TAG = "common"; +// private final String FORM_EXTEND_ATTRIBUTE_TAG = "common"; @Resource private AutoexecJobMapper autoexecJobMapper; @@ -304,10 +304,13 @@ public class AutoexecProcessComponent extends ProcessStepHandlerBase { // processTaskFormAttributeDataMap = processTaskFormAttributeDataList.stream().collect(Collectors.toMap(e -> e.getAttributeUuid(), e -> e)); // } // } + String formTag = autoexecConfig.getString("formTag"); IProcessTaskCrossoverService processTaskCrossoverService = CrossoverServiceFactory.getApi(IProcessTaskCrossoverService.class); - List formAttributeList = processTaskCrossoverService.getFormAttributeListByProcessTaskIdAngTag(processTaskId, FORM_EXTEND_ATTRIBUTE_TAG); +// List formAttributeList = processTaskCrossoverService.getFormAttributeListByProcessTaskIdAngTag(processTaskId, FORM_EXTEND_ATTRIBUTE_TAG); + List formAttributeList = processTaskCrossoverService.getFormAttributeListByProcessTaskIdAngTagNew(processTaskId, formTag); if (CollectionUtils.isNotEmpty(formAttributeList)) { - List processTaskFormAttributeDataList = processTaskCrossoverService.getProcessTaskFormAttributeDataListByProcessTaskIdAndTag(processTaskId, FORM_EXTEND_ATTRIBUTE_TAG); +// List processTaskFormAttributeDataList = processTaskCrossoverService.getProcessTaskFormAttributeDataListByProcessTaskIdAndTag(processTaskId, FORM_EXTEND_ATTRIBUTE_TAG); + List processTaskFormAttributeDataList = processTaskCrossoverService.getProcessTaskFormAttributeDataListByProcessTaskIdAndTagNew(processTaskId, formTag); // 添加表格组件中的子组件到组件列表中 for (FormAttributeVo formAttributeVo : formAttributeList) { formAttributeMap.put(formAttributeVo.getUuid(), formAttributeVo); diff --git a/src/main/java/neatlogic/module/autoexec/stephandler/utilhandler/AutoexecProcessUtilHandler.java b/src/main/java/neatlogic/module/autoexec/stephandler/utilhandler/AutoexecProcessUtilHandler.java index 2da695e0..206eb635 100644 --- a/src/main/java/neatlogic/module/autoexec/stephandler/utilhandler/AutoexecProcessUtilHandler.java +++ b/src/main/java/neatlogic/module/autoexec/stephandler/utilhandler/AutoexecProcessUtilHandler.java @@ -274,6 +274,11 @@ public class AutoexecProcessUtilHandler extends ProcessStepInternalHandlerBase { id = SnowflakeUtil.uniqueLong(); } configObj.put("id", id); + String formTag = config.getString("formTag"); + if (StringUtils.isBlank(formTag)) { + formTag = StringUtils.EMPTY; + } + configObj.put("formTag", formTag); Long autoexecCombopId = config.getLong("autoexecCombopId"); if (autoexecCombopId != null) { configObj.put("autoexecCombopId", autoexecCombopId); -- Gitee