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 4ba08856112068202574c2fdb04d3a918a8bcc08..331748423cce0a851c7fc36531198b94c025a63a 100644 --- a/src/main/java/neatlogic/module/autoexec/stephandler/component/AutoexecProcessComponent.java +++ b/src/main/java/neatlogic/module/autoexec/stephandler/component/AutoexecProcessComponent.java @@ -272,7 +272,8 @@ public class AutoexecProcessComponent extends ProcessStepHandlerBase { if (CollectionUtils.isNotEmpty(formAttributeList)) { formAttributeMap = formAttributeList.stream().collect(Collectors.toMap(e -> e.getUuid(), e -> e)); } - List processTaskFormAttributeDataList = processTaskMapper.getProcessTaskStepFormAttributeDataByProcessTaskId(processTaskId); + IProcessTaskCrossoverService processTaskCrossoverService = CrossoverServiceFactory.getApi(IProcessTaskCrossoverService.class); + List processTaskFormAttributeDataList = processTaskCrossoverService.getProcessTaskFormAttributeDataListByProcessTaskId(processTaskId); if (CollectionUtils.isNotEmpty(processTaskFormAttributeDataList)) { processTaskFormAttributeDataMap = processTaskFormAttributeDataList.stream().collect(Collectors.toMap(e -> e.getAttributeUuid(), e -> e)); } @@ -492,8 +493,8 @@ public class AutoexecProcessComponent extends ProcessStepHandlerBase { if (formAttributeDataVo == null) { return tbodyList; } - if (!Objects.equals(formAttributeDataVo.getType(), neatlogic.framework.form.constvalue.FormHandler.FORMTABLEINPUTER.getHandler()) - && !Objects.equals(formAttributeDataVo.getType(), neatlogic.framework.form.constvalue.FormHandler.FORMTABLESELECTOR.getHandler())) { + if (!Objects.equals(formAttributeDataVo.getHandler(), neatlogic.framework.form.constvalue.FormHandler.FORMTABLEINPUTER.getHandler()) + && !Objects.equals(formAttributeDataVo.getHandler(), neatlogic.framework.form.constvalue.FormHandler.FORMTABLESELECTOR.getHandler())) { return tbodyList; } if (formAttributeDataVo.getDataObj() == null) { @@ -617,10 +618,10 @@ public class AutoexecProcessComponent extends ProcessStepHandlerBase { } else if (Objects.equals(mappingMode, "formCommonComponent")) { ProcessTaskFormAttributeDataVo attributeDataVo = processTaskFormAttributeDataMap.get(value); if (attributeDataVo != null) { - if (formTextAttributeList.contains(attributeDataVo.getType())) { + if (formTextAttributeList.contains(attributeDataVo.getHandler())) { String type = runtimeParamObj.getString("type"); param.put(key, convertDateType(type, (String) attributeDataVo.getDataObj())); - } else if (formSelectAttributeList.contains(attributeDataVo.getType())) { + } else if (formSelectAttributeList.contains(attributeDataVo.getHandler())) { IFormCrossoverService formCrossoverService = CrossoverServiceFactory.getApi(IFormCrossoverService.class); Object valueObject = formCrossoverService.getFormSelectAttributeValueByOriginalValue(attributeDataVo.getDataObj()); param.put(key, valueObject); @@ -708,10 +709,10 @@ public class AutoexecProcessComponent extends ProcessStepHandlerBase { if (attributeDataVo != null) { Object dataObj = attributeDataVo.getDataObj(); if (dataObj != null) { - if (Objects.equals(attributeDataVo.getType(), FormHandler.FORMRESOURECES.getHandler())) { + if (Objects.equals(attributeDataVo.getHandler(), FormHandler.FORMRESOURECES.getHandler())) { // 映射的表单组件是执行目标 executeNodeConfigVo = ((JSONObject) dataObj).toJavaObject(AutoexecCombopExecuteNodeConfigVo.class); - } else if (formTextAttributeList.contains(attributeDataVo.getType())) { + } else if (formTextAttributeList.contains(attributeDataVo.getHandler())) { // 映射的表单组件是文本框 String dataStr = dataObj.toString(); try { @@ -873,12 +874,13 @@ public class AutoexecProcessComponent extends ProcessStepHandlerBase { String value = formAttributeObj.getString("value"); formAttributeNewDataMap.put(key, autoexecJobEnvMap.get(value)); } - List processTaskFormAttributeDataList = processTaskMapper.getProcessTaskStepFormAttributeDataByProcessTaskId(processTaskStepVo.getProcessTaskId()); + IProcessTaskCrossoverService processTaskCrossoverService = CrossoverServiceFactory.getApi(IProcessTaskCrossoverService.class); + List processTaskFormAttributeDataList = processTaskCrossoverService.getProcessTaskFormAttributeDataListByProcessTaskId(processTaskStepVo.getProcessTaskId()); for (ProcessTaskFormAttributeDataVo processTaskFormAttributeDataVo : processTaskFormAttributeDataList) { JSONObject formAttributeDataObj = new JSONObject(); String attributeUuid = processTaskFormAttributeDataVo.getAttributeUuid(); formAttributeDataObj.put("attributeUuid", attributeUuid); - formAttributeDataObj.put("handler", processTaskFormAttributeDataVo.getType()); + formAttributeDataObj.put("handler", processTaskFormAttributeDataVo.getHandler()); Object newData = formAttributeNewDataMap.get(attributeUuid); if (newData != null) { formAttributeDataObj.put("dataList", newData); @@ -915,7 +917,8 @@ public class AutoexecProcessComponent extends ProcessStepHandlerBase { private Object parseMappingValue(ProcessTaskStepVo currentProcessTaskStepVo, String mappingMode, Object value) { if ("form".equals(mappingMode)) { - List processTaskFormAttributeDataVoList = processTaskMapper.getProcessTaskStepFormAttributeDataByProcessTaskId(currentProcessTaskStepVo.getProcessTaskId()); + IProcessTaskCrossoverService processTaskCrossoverService = CrossoverServiceFactory.getApi(IProcessTaskCrossoverService.class); + List processTaskFormAttributeDataVoList = processTaskCrossoverService.getProcessTaskFormAttributeDataListByProcessTaskId(currentProcessTaskStepVo.getProcessTaskId()); for (ProcessTaskFormAttributeDataVo attributeDataVo : processTaskFormAttributeDataVoList) { if (Objects.equals(value, attributeDataVo.getAttributeUuid())) { return attributeDataVo.getDataObj(); @@ -1078,13 +1081,13 @@ public class AutoexecProcessComponent extends ProcessStepHandlerBase { formAttributeDataList = new JSONArray(); List hidecomponentList = formAttributeList.stream().map(FormAttributeVo::getUuid).collect(Collectors.toList()); paramObj.put("hidecomponentList", hidecomponentList); - List processTaskFormAttributeDataList = processTaskMapper.getProcessTaskStepFormAttributeDataByProcessTaskId(processTaskStepVo.getProcessTaskId()); + List processTaskFormAttributeDataList = processTaskCrossoverService.getProcessTaskFormAttributeDataListByProcessTaskId(processTaskStepVo.getProcessTaskId()); Map processTaskFormAttributeDataMap = processTaskFormAttributeDataList.stream().collect(Collectors.toMap(e -> e.getAttributeUuid(), e -> e)); for (Map.Entry entry : processTaskFormAttributeDataMap.entrySet()) { ProcessTaskFormAttributeDataVo processTaskFormAttributeDataVo = entry.getValue(); JSONObject formAttributeDataObj = new JSONObject(); formAttributeDataObj.put("attributeUuid", processTaskFormAttributeDataVo.getAttributeUuid()); - formAttributeDataObj.put("handler", processTaskFormAttributeDataVo.getType()); + formAttributeDataObj.put("handler", processTaskFormAttributeDataVo.getHandler()); formAttributeDataObj.put("dataList", processTaskFormAttributeDataVo.getDataObj()); formAttributeDataList.add(formAttributeDataObj); }