delete setProperties method

o2server/x_base_core_project/src/main/java/com/x/base/core/entity/JpaObject.java

@@ -82,24 +82,28 @@ public abstract class JpaObject extends GsonPropertyObject implements Serializab
 
 	public static final String scratchInteger_FIELDNAME = "scratchInteger";
 
+	public static final String properties_FIELDNAME = "properties";
+
 	public static final String JsonPropertiesValueHandler = "com.x.base.core.entity.annotation.JsonPropertiesValueHandler";
 
-	public static final List<String> FieldsUnmodify = ListUtils.unmodifiableList(Arrays.asList(id_FIELDNAME,
-			distributeFactor_FIELDNAME, createTime_FIELDNAME, updateTime_FIELDNAME, sequence_FIELDNAME,
-			scratchString_FIELDNAME, scratchBoolean_FIELDNAME, scratchDate_FIELDNAME, scratchInteger_FIELDNAME));
+	public static final List<String> FieldsUnmodify = ListUtils
+			.unmodifiableList(Arrays.asList(id_FIELDNAME, distributeFactor_FIELDNAME, createTime_FIELDNAME,
+					updateTime_FIELDNAME, sequence_FIELDNAME, scratchString_FIELDNAME, scratchBoolean_FIELDNAME,
+					scratchDate_FIELDNAME, scratchInteger_FIELDNAME, properties_FIELDNAME));
 
-	public static final List<String> FieldsUnmodifyExcludeId = ListUtils.unmodifiableList(Arrays.asList(
-			distributeFactor_FIELDNAME, createTime_FIELDNAME, updateTime_FIELDNAME, sequence_FIELDNAME,
-			scratchString_FIELDNAME, scratchBoolean_FIELDNAME, scratchDate_FIELDNAME, scratchInteger_FIELDNAME));
+	public static final List<String> FieldsUnmodifyExcludeId = ListUtils
+			.unmodifiableList(Arrays.asList(distributeFactor_FIELDNAME, createTime_FIELDNAME, updateTime_FIELDNAME,
+					sequence_FIELDNAME, scratchString_FIELDNAME, scratchBoolean_FIELDNAME, scratchDate_FIELDNAME,
+					scratchInteger_FIELDNAME, properties_FIELDNAME));
 
 	public static final List<String> FieldsInvisible = ListUtils.unmodifiableList(
 			Arrays.asList(distributeFactor_FIELDNAME, sequence_FIELDNAME, password_FIELDNAME, scratchString_FIELDNAME,
-					scratchBoolean_FIELDNAME, scratchDate_FIELDNAME, scratchInteger_FIELDNAME));
+					scratchBoolean_FIELDNAME, scratchDate_FIELDNAME, scratchInteger_FIELDNAME, properties_FIELDNAME));
 
 	public static final List<String> FieldsDefault = ListUtils
 			.unmodifiableList(Arrays.asList(id_FIELDNAME, key_FIELDNAME, createTime_FIELDNAME, updateTime_FIELDNAME,
 					sequence_FIELDNAME, distributeFactor_FIELDNAME, password_FIELDNAME, scratchString_FIELDNAME,
-					scratchBoolean_FIELDNAME, scratchDate_FIELDNAME, scratchInteger_FIELDNAME));
+					scratchBoolean_FIELDNAME, scratchDate_FIELDNAME, scratchInteger_FIELDNAME, properties_FIELDNAME));
 
 	@FieldDescribe("创建时间,自动生成,索引创建在约束中.")
 	@Column(name = ColumnNamePrefix + createTime_FIELDNAME)

o2server/x_processplatform_assemble_designer/src/main/java/com/x/processplatform/assemble/designer/jaxrs/form/ActionEdit.java

@@ -63,12 +63,16 @@ class ActionEdit extends BaseAction {
 			Wi.copier.copy(wi, form);
 			form.setId(id);
 			form.setApplication(application.getId());
-			FormProperties properties = new FormProperties();
-			properties.setRelatedFormList(wi.getRelatedFormList());
-			properties.setMobileRelatedFormList(wi.getMobileRelatedFormList());
-			properties.setRelatedScriptMap(wi.getRelatedScriptMap());
-			properties.setMobileRelatedScriptMap(wi.getMobileRelatedScriptMap());
-			form.setProperties(properties);
+			// FormProperties properties = new FormProperties();
+//			properties.setRelatedFormList(wi.getRelatedFormList());
+//			properties.setMobileRelatedFormList(wi.getMobileRelatedFormList());
+//			properties.setRelatedScriptMap(wi.getRelatedScriptMap());
+//			properties.setMobileRelatedScriptMap(wi.getMobileRelatedScriptMap());
+			// form.setP!!!roperties(properties);
+			form.getProperties().setRelatedFormList(wi.getRelatedFormList());
+			form.getProperties().setMobileRelatedFormList(wi.getMobileRelatedFormList());
+			form.getProperties().setRelatedScriptMap(wi.getRelatedScriptMap());
+			form.getProperties().setMobileRelatedScriptMap(wi.getMobileRelatedScriptMap());
 			emc.check(form, CheckPersistType.all);
 			emc.commit();
 			ApplicationCache.notify(Form.class);

o2server/x_processplatform_assemble_designer/src/main/java/com/x/processplatform/assemble/designer/jaxrs/process/BaseAction.java

@@ -726,6 +726,7 @@ abstract class BaseAction extends StandardJaxrsAction {
 					business.entityManagerContainer().persist(o, CheckPersistType.all);
 				} else {
 					WrapRoute.inCopier.copy(w, o);
+
 					business.entityManagerContainer().check(o, CheckPersistType.all);
 				}
 			}

o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/Draft.java

@@ -238,8 +238,6 @@ public class Draft extends SliceJpaObject {
 		this.unit = unit;
 	}
 
-	public void setProperties(DraftProperties properties) {
-		this.properties = properties;
-	}
+ 
 
 }
\ No newline at end of file

o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/ReadCompleted.java

@@ -1142,8 +1142,6 @@ public class ReadCompleted extends SliceJpaObject implements ProjectionInterface
 		this.currentActivityName = currentActivityName;
 	}
 
-	public void setProperties(ReadCompletedProperties properties) {
-		this.properties = properties;
-	}
+ 
 
 }
\ No newline at end of file

o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/Record.java

@@ -467,9 +467,7 @@ public class Record extends SliceJpaObject {
 		this.type = type;
 	}
 
-	public void setProperties(RecordProperties properties) {
-		this.properties = properties;
-	}
+ 
 
 	public String getApplication() {
 		return application;

o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/Review.java

@@ -956,8 +956,5 @@ public class Review extends SliceJpaObject implements ProjectionInterface {
 		return stringValue01_FIELDNAME;
 	}
 
-	public void setProperties(ReviewProperties properties) {
-		this.properties = properties;
-	}
-
+ 
 }
\ No newline at end of file

o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/TaskCompleted.java

@@ -1486,9 +1486,7 @@ public class TaskCompleted extends SliceJpaObject implements ProjectionInterface
 		this.empowerFromIdentity = empowerFromIdentity;
 	}
 
-	public void setProperties(TaskCompletedProperties properties) {
-		this.properties = properties;
-	}
+ 
 
 	public String getProcessingType() {
 		return processingType;

o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/Work.java

@@ -1268,9 +1268,7 @@ public class Work extends SliceJpaObject implements ProjectionInterface {
 		this.workCreateType = workCreateType;
 	}
 
-	public void setProperties(WorkProperties properties) {
-		this.properties = properties;
-	}
+ 
 
 	public void setManualTaskIdentityList(List<String> manualTaskIdentityList) {
 		this.manualTaskIdentityList = manualTaskIdentityList;

o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/WorkCompleted.java

@@ -1049,9 +1049,7 @@ public class WorkCompleted extends SliceJpaObject implements ProjectionInterface
 		this.merged = merged;
 	}
 
-	public void setProperties(WorkCompletedProperties properties) {
-		this.properties = properties;
-	}
+ 
 
 	public String getActivity() {
 		return activity;

o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Form.java

@@ -194,7 +194,7 @@ public class Form extends SliceJpaObject {
 	public static final String data_FIELDNAME = "data";
 	@FieldDescribe("文本内容.")
 	@Lob
-@Basic(fetch = FetchType.EAGER)
+	@Basic(fetch = FetchType.EAGER)
 //	@Persistent(fetch = FetchType.EAGER)
 	@Column(length = JpaObject.length_10M, name = ColumnNamePrefix + data_FIELDNAME)
 	@CheckPersist(allowEmpty = true)
@@ -203,8 +203,8 @@ public class Form extends SliceJpaObject {
 	public static final String mobileData_FIELDNAME = "mobileData";
 	@FieldDescribe("移动端文本内容.")
 	@Lob
-	 @Basic(fetch = FetchType.EAGER)
-	//@Persistent(fetch = FetchType.EAGER)
+	@Basic(fetch = FetchType.EAGER)
+	// @Persistent(fetch = FetchType.EAGER)
 	@Column(length = JpaObject.length_10M, name = ColumnNamePrefix + mobileData_FIELDNAME)
 	@CheckPersist(allowEmpty = true)
 	private String mobileData;
@@ -307,8 +307,4 @@ public class Form extends SliceJpaObject {
 		this.hasMobile = hasMobile;
 	}
 
-	public void setProperties(FormProperties properties) {
-		this.properties = properties;
-	}
-
 }
\ No newline at end of file

o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Manual.java

@@ -636,9 +636,7 @@ public class Manual extends Activity {
 	@CheckPersist(allowEmpty = true)
 	private ManualProperties properties;
 
-	public void setProperties(ManualProperties properties) {
-		this.properties = properties;
-	}
+ 
 
 	public String getDisplayLogScript() {
 		return displayLogScript;

o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Route.java

@@ -85,10 +85,6 @@ public class Route extends SliceJpaObject {
 		return this.properties;
 	}
 
-	public void setProperties(RouteProperties properties) {
-		this.properties = properties;
-	}
-
 	public Boolean getAsyncSupported() {
 		return asyncSupported;
 	}

o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/log/SignalStackLog.java

@@ -69,10 +69,6 @@ public class SignalStackLog extends SliceJpaObject {
 		return this.properties;
 	}
 
-	public void setProperties(SignalStackLogProperties properties) {
-		this.properties = properties;
-	}
-
 	public SignalStack getSignalStack() {
 		return this.getProperties().getSignalStack();
 	}