diff --git a/pom.xml b/pom.xml
index d7e86cd07b45006963269961ae66fa291b29e2c4..1f0573b1810a658243d61164ee6c9bc6a4aa4969 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
com.inspur.edp
viewObject-model1
pom
- 0.2.2-SNAPSHOT
+ 0.2.3-SNAPSHOT
view-object-model
view-object-manager
@@ -63,13 +63,13 @@
0.1.3
0.1.0
0.1.9
- 0.2.2-SNAPSHOT
+ 0.2.2
0.2.0-rc.6
0.3.0-rc.4
0.2.0-rc.4
0.1.0
0.1.17
- 0.3.5
+ 1.6.0
0.2.56
1.0.0-rc.4
diff --git a/view-object-api/pom.xml b/view-object-api/pom.xml
index def07df4f5e76fbf37bb7c345b1fe9cc307ff1f3..ef258027275a6a0a65dd750754e201c3133d5c5b 100644
--- a/view-object-api/pom.xml
+++ b/view-object-api/pom.xml
@@ -20,7 +20,7 @@
com.inspur.edp
viewObject-model1
- 0.2.2-SNAPSHOT
+ 0.2.3-SNAPSHOT
view-object-api
diff --git a/view-object-manager/pom.xml b/view-object-manager/pom.xml
index 7b762838637e718b359000189121935cd53d8830..9aca5c1fc8ff32c0b959d93b5538cb419ae3348b 100644
--- a/view-object-manager/pom.xml
+++ b/view-object-manager/pom.xml
@@ -21,7 +21,7 @@
com.inspur.edp
viewObject-model1
- 0.2.2-SNAPSHOT
+ 0.2.3-SNAPSHOT
view-object-manager
diff --git a/view-object-model/pom.xml b/view-object-model/pom.xml
index 7df9427c2eb81b37751c8457db0843a523622549..44570274c1493c2f236ebfb199ad1ed4faaa27a5 100644
--- a/view-object-model/pom.xml
+++ b/view-object-model/pom.xml
@@ -21,7 +21,7 @@
com.inspur.edp
viewObject-model1
- 0.2.2-SNAPSHOT
+ 0.2.3-SNAPSHOT
view-object-model
diff --git a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/formentity/VoFormModel.java b/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/formentity/VoFormModel.java
index 4efd5de9ee71c6446e319dfa02ada3b4469688db..1f807f8083dfab1f7441834fa9588fecf0410766 100644
--- a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/formentity/VoFormModel.java
+++ b/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/formentity/VoFormModel.java
@@ -1,9 +1,27 @@
+/*
+ * Copyright (c) 2020 - present, Inspur Genersoft Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package com.inspur.edp.formserver.viewmodel.formentity;
import lombok.Getter;
+import lombok.Setter;
import java.util.List;
+@Setter
@Getter
public class VoFormModel {
private String id;
@@ -18,59 +36,5 @@ public class VoFormModel {
private List buttonGroup;
private ObjectData objectAuthInfo;
private List methodGroup;
- private List attachmentGroup;
-
-
- public void setId(String id) {
- this.id = id;
- }
-
- public void setCode(String code) {
- this.code = code;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public void setUrlType(String urlType) {
- this.urlType = urlType;
- }
-
- public void setUrl(String url) {
- this.url = url;
- }
-
- public void setUrlParameters(List urlParameters) {
- this.urlParameters = urlParameters;
- }
-
- public void setFormatType(String formatType) {
- this.formatType = formatType;
- }
-
- public void setTerminal(String terminal) {
- this.terminal = terminal;
- }
-
- public void setButtonGroup(List buttonGroup) {
- this.buttonGroup = buttonGroup;
- }
-
- public void setObjectAuthInfo(ObjectData objectData) {
- this.objectAuthInfo = objectData;
- }
-
- public void setMethods(List methodGroup) {
- this.methodGroup = methodGroup;
- }
-
- public void setProjectPath(String projectPath) {
- this.projectPath = projectPath;
- }
-
- public void setAttachmentGroup(List attachmentGroup) {
- this.attachmentGroup = attachmentGroup;
- }
-
+ private String extendParameters;
}
diff --git a/view-object-rtapi/pom.xml b/view-object-rtapi/pom.xml
index c973698eccdcf46d45d7d66fe807eaa049ab6579..ae22ebbd5a832801e8f56551bf2b99cd0e513288 100644
--- a/view-object-rtapi/pom.xml
+++ b/view-object-rtapi/pom.xml
@@ -20,7 +20,7 @@
com.inspur.edp
viewObject-model1
- 0.2.2-SNAPSHOT
+ 0.2.3-SNAPSHOT
view-object-rtapi
diff --git a/view-object-rtwebapi/pom.xml b/view-object-rtwebapi/pom.xml
index 4159bfbc640a4de470b6711c59b18347c3edaf59..923805b0ac1e4a0c03b9643d7cb8a2962c2b484d 100644
--- a/view-object-rtwebapi/pom.xml
+++ b/view-object-rtwebapi/pom.xml
@@ -20,7 +20,7 @@
com.inspur.edp
viewObject-model1
- 0.2.2-SNAPSHOT
+ 0.2.3-SNAPSHOT
view-object-rtwebapi
diff --git a/view-object-voextendinfo-server-api/pom.xml b/view-object-voextendinfo-server-api/pom.xml
index 931a6cf14399639f7df310ef548d230736a7be14..b79c3623a7e8dd8bf6ea7101557f7c977aa279cb 100644
--- a/view-object-voextendinfo-server-api/pom.xml
+++ b/view-object-voextendinfo-server-api/pom.xml
@@ -19,7 +19,7 @@
com.inspur.edp
viewObject-model1
- 0.2.2-SNAPSHOT
+ 0.2.3-SNAPSHOT
4.0.0
diff --git a/view-object-voextendinfo-server-core/pom.xml b/view-object-voextendinfo-server-core/pom.xml
index 035aa6658fd116cc933eb0670d1b76e2eedc7f97..491a129ab035d40a704e89feef6b1c9d4a250b7c 100644
--- a/view-object-voextendinfo-server-core/pom.xml
+++ b/view-object-voextendinfo-server-core/pom.xml
@@ -19,7 +19,7 @@
com.inspur.edp
viewObject-model1
- 0.2.2-SNAPSHOT
+ 0.2.3-SNAPSHOT
4.0.0
diff --git a/view-object-webapi/pom.xml b/view-object-webapi/pom.xml
index 1a7dbbd70b880f76c814fb823beae213173fde83..6df8b61b699dc35d3510787fb327eae7c4bcfa73 100644
--- a/view-object-webapi/pom.xml
+++ b/view-object-webapi/pom.xml
@@ -21,7 +21,7 @@
com.inspur.edp
viewObject-model1
- 0.2.2-SNAPSHOT
+ 0.2.3-SNAPSHOT
view-object-webapi
diff --git a/view-object-webapi/src/main/java/com/inspur/edp/formserver/viewmodel/core/buildformformat/VoBuildFormFormatServiceImpl.java b/view-object-webapi/src/main/java/com/inspur/edp/formserver/viewmodel/core/buildformformat/VoBuildFormFormatServiceImpl.java
index 15ee44b78a852836aa574ca9872c1f4ef59f3dba..0667048cd3e169b66cdda83156b7cdf44ebe3fcc 100644
--- a/view-object-webapi/src/main/java/com/inspur/edp/formserver/viewmodel/core/buildformformat/VoBuildFormFormatServiceImpl.java
+++ b/view-object-webapi/src/main/java/com/inspur/edp/formserver/viewmodel/core/buildformformat/VoBuildFormFormatServiceImpl.java
@@ -137,6 +137,9 @@ public class VoBuildFormFormatServiceImpl implements VoBuildFormFormatService {
List formMethods = buildMethod(methodGroups, formId);
format.setFormMethods(formMethods);
}
+
+ format.setExtendParameters(voFormModel.getExtendParameters());
+
//检测已建表单VO内是否存在对应流程自定义变量
checkFormConfigID(voId, voFormModel.getProjectPath());
//调用流程rpc服务推送