Merge branch 'feature/java11' into 'develop'

fix

See merge request o2oa/o2oa!1580

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

@@ -9,6 +9,11 @@ import javax.persistence.PostLoad;
 import javax.persistence.Table;
 import javax.persistence.UniqueConstraint;
 
+import org.apache.commons.lang3.StringUtils;
+import org.apache.openjpa.persistence.Persistent;
+import org.apache.openjpa.persistence.jdbc.Index;
+import org.apache.openjpa.persistence.jdbc.Strategy;
+
 import com.x.base.core.entity.JpaObject;
 import com.x.base.core.entity.SliceJpaObject;
 import com.x.base.core.entity.annotation.CheckPersist;
@@ -17,11 +22,6 @@ import com.x.base.core.project.annotation.FieldDescribe;
 import com.x.base.core.project.tools.StringTools;
 import com.x.processplatform.core.entity.PersistenceProperties;
 
-import org.apache.commons.lang3.StringUtils;
-import org.apache.openjpa.persistence.Persistent;
-import org.apache.openjpa.persistence.jdbc.Index;
-import org.apache.openjpa.persistence.jdbc.Strategy;
-
 @Entity
 @ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Table(name = PersistenceProperties.Content.Draft.table, uniqueConstraints = {
@@ -88,6 +88,10 @@ public class Draft extends SliceJpaObject {
 		return this.properties;
 	}
 
+	public void setProperties(DraftProperties properties) {
+		this.properties = properties;
+	}
+
 	public static final String title_FIELDNAME = "title";
 	@FieldDescribe("标题.")
 	@Column(length = length_255B, name = ColumnNamePrefix + title_FIELDNAME)
@@ -238,6 +242,4 @@ public class Draft extends SliceJpaObject {
 		this.unit = unit;
 	}
 
- 
-
 }

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

@@ -169,6 +169,10 @@ public class ReadCompleted extends SliceJpaObject implements ProjectionInterface
 		}
 		return this.properties;
 	}
+	
+	public void setProperties(ReadCompletedProperties properties) {
+		this.properties = properties;
+	}
 
 	public static final String job_FIELDNAME = "job";
 	@FieldDescribe("任务.")

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

@@ -13,6 +13,11 @@ import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 import javax.persistence.UniqueConstraint;
 
+import org.apache.commons.lang3.StringUtils;
+import org.apache.openjpa.persistence.Persistent;
+import org.apache.openjpa.persistence.jdbc.Index;
+import org.apache.openjpa.persistence.jdbc.Strategy;
+
 import com.x.base.core.entity.AbstractPersistenceProperties;
 import com.x.base.core.entity.JpaObject;
 import com.x.base.core.entity.SliceJpaObject;
@@ -23,11 +28,6 @@ import com.x.base.core.project.tools.DateTools;
 import com.x.base.core.project.tools.StringTools;
 import com.x.processplatform.core.entity.PersistenceProperties;
 
-import org.apache.commons.lang3.StringUtils;
-import org.apache.openjpa.persistence.Persistent;
-import org.apache.openjpa.persistence.jdbc.Index;
-import org.apache.openjpa.persistence.jdbc.Strategy;
-
 @Entity
 @ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
 @Table(name = PersistenceProperties.Content.Review.table, uniqueConstraints = {
@@ -152,6 +152,10 @@ public class Review extends SliceJpaObject implements ProjectionInterface {
 		return this.properties;
 	}
 
+	public void setProperties(ReviewProperties properties) {
+		this.properties = properties;
+	}
+
 	public static final String job_FIELDNAME = "job";
 	@FieldDescribe("任务.")
 	@Column(length = JpaObject.length_id, name = ColumnNamePrefix + job_FIELDNAME)
@@ -956,5 +960,4 @@ public class Review extends SliceJpaObject implements ProjectionInterface {
 		return stringValue01_FIELDNAME;
 	}
 
- 
 }

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

@@ -178,6 +178,10 @@ public class Task extends SliceJpaObject implements ProjectionInterface {
 		return this.properties;
 	}
 
+	public void setProperties(TaskProperties properties) {
+		this.properties = properties;
+	}
+
 	public static final String job_FIELDNAME = "job";
 	@FieldDescribe("任务.")
 	@Column(length = JpaObject.length_id, name = ColumnNamePrefix + job_FIELDNAME)
@@ -1280,10 +1284,6 @@ public class Task extends SliceJpaObject implements ProjectionInterface {
 		this.workCreateType = workCreateType;
 	}
 
-	public void setProperties(TaskProperties properties) {
-		this.properties = properties;
-	}
-
 	public String getSeries() {
 		return series;
 	}

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

@@ -19,6 +19,12 @@ import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 import javax.persistence.UniqueConstraint;
 
+import org.apache.commons.lang3.BooleanUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.openjpa.persistence.Persistent;
+import org.apache.openjpa.persistence.jdbc.Index;
+import org.apache.openjpa.persistence.jdbc.Strategy;
+
 import com.x.base.core.entity.JpaObject;
 import com.x.base.core.entity.SliceJpaObject;
 import com.x.base.core.entity.annotation.CheckPersist;
@@ -32,12 +38,6 @@ import com.x.processplatform.core.entity.content.TaskCompletedProperties.PrevTas
 import com.x.processplatform.core.entity.element.ActivityType;
 import com.x.processplatform.core.entity.element.Route;
 
-import org.apache.commons.lang3.BooleanUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.openjpa.persistence.Persistent;
-import org.apache.openjpa.persistence.jdbc.Index;
-import org.apache.openjpa.persistence.jdbc.Strategy;
-
 /**
  * 没有多值字段
  * 
@@ -111,18 +111,18 @@ public class TaskCompleted extends SliceJpaObject implements ProjectionInterface
 			this.processingType = PROCESSINGTYPE_TASK;
 		}
 		switch (this.processingType) {
-			case PROCESSINGTYPE_APPENDTASK:
-			case PROCESSINGTYPE_BEAPPENDEDTASK:
-			case PROCESSINGTYPE_REROUTE:
-			case PROCESSINGTYPE_RETRACT:
-			case PROCESSINGTYPE_ROLLBACK:
-			case PROCESSINGTYPE_EMPOWER:
-			case PROCESSINGTYPE_RESET:
-				this.joinInquire = false;
-				break;
-			default:
-				this.joinInquire = true;
-				break;
+		case PROCESSINGTYPE_APPENDTASK:
+		case PROCESSINGTYPE_BEAPPENDEDTASK:
+		case PROCESSINGTYPE_REROUTE:
+		case PROCESSINGTYPE_RETRACT:
+		case PROCESSINGTYPE_ROLLBACK:
+		case PROCESSINGTYPE_EMPOWER:
+		case PROCESSINGTYPE_RESET:
+			this.joinInquire = false;
+			break;
+		default:
+			this.joinInquire = true;
+			break;
 		}
 
 		if (StringTools.utf8Length(this.getProperties().getTitle()) > length_255B) {
@@ -345,6 +345,10 @@ public class TaskCompleted extends SliceJpaObject implements ProjectionInterface
 		return this.properties;
 	}
 
+	public void setProperties(TaskCompletedProperties properties) {
+		this.properties = properties;
+	}
+
 	public static final String job_FIELDNAME = "job";
 	@FieldDescribe("任务.")
 	@Column(length = JpaObject.length_id, name = ColumnNamePrefix + job_FIELDNAME)
@@ -1486,8 +1490,6 @@ public class TaskCompleted extends SliceJpaObject implements ProjectionInterface
 		this.empowerFromIdentity = empowerFromIdentity;
 	}
 
- 
-
 	public String getProcessingType() {
 		return processingType;
 	}

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

@@ -129,6 +129,10 @@ public class Work extends SliceJpaObject implements ProjectionInterface {
 		return this.properties;
 	}
 
+	public void setProperties(WorkProperties properties) {
+		this.properties = properties;
+	}
+
 	public void setTitle(String title) {
 		this.title = title;
 		this.getProperties().setTitle(title);
@@ -1268,8 +1272,6 @@ public class Work extends SliceJpaObject implements ProjectionInterface {
 		this.workCreateType = workCreateType;
 	}
 
- 
-
 	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

@@ -137,6 +137,10 @@ public class WorkCompleted extends SliceJpaObject implements ProjectionInterface
 		}
 		return this.properties;
 	}
+	
+	public void setProperties(WorkCompletedProperties properties) {
+		this.properties = properties;
+	}
 
 	public void setTitle(String title) {
 		this.title = title;

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

@@ -103,6 +103,10 @@ public class WorkLog extends SliceJpaObject {
 		return this.properties;
 	}
 
+	public void setProperties(WorkLogProperties properties) {
+		this.properties = properties;
+	}
+
 	public static final String job_FIELDNAME = "job";
 	@FieldDescribe("任务标识")
 	@Column(length = JpaObject.length_id, name = ColumnNamePrefix + job_FIELDNAME)
@@ -650,8 +654,4 @@ public class WorkLog extends SliceJpaObject {
 		return arrivedOpinionGroup_FIELDNAME;
 	}
 
-	public void setProperties(WorkLogProperties properties) {
-		this.properties = properties;
-	}
-
 }

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

@@ -33,6 +33,7 @@ import com.x.base.core.entity.annotation.IdReference;
 import com.x.base.core.entity.annotation.RestrictFlag;
 import com.x.base.core.project.annotation.FieldDescribe;
 import com.x.processplatform.core.entity.PersistenceProperties;
+import com.x.processplatform.core.entity.content.WorkLogProperties;
 
 @Entity
 @ContainerEntity(dumpSize = 5, type = ContainerEntity.Type.element, reference = ContainerEntity.Reference.strong)
@@ -104,6 +105,10 @@ public class Form extends SliceJpaObject {
 		}
 		return this.properties;
 	}
+	
+	public void setProperties(FormProperties properties) {
+		this.properties = properties;
+	}
 
 	public String getDataOrMobileData() {
 		if (StringUtils.isNotEmpty(this.getData())) {

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

@@ -68,7 +68,6 @@ public class Manual extends Activity {
 
 	@PostLoad
 	public void postLoad() {
-		// this.asyncSupported = this.getProperties().getAsyncSupported();
 	}
 
 	public Manual() {
@@ -82,17 +81,9 @@ public class Manual extends Activity {
 		return this.properties;
 	}
 
-//	public Boolean getAsyncSupported() {
-//		return asyncSupported;
-//	}
-//
-//	public void setAsyncSupported(Boolean asyncSupported) {
-//		this.asyncSupported = asyncSupported;
-//		this.getProperties().setAsyncSupported(asyncSupported);
-//	}
-//
-//	@Transient
-//	private Boolean asyncSupported;
+	public void setProperties(ManualProperties properties) {
+		this.properties = properties;
+	}
 
 	@FieldDescribe("分组")
 	@CheckPersist(allowEmpty = true)
@@ -636,8 +627,6 @@ public class Manual extends Activity {
 	@CheckPersist(allowEmpty = true)
 	private ManualProperties properties;
 
- 
-
 	public String getDisplayLogScript() {
 		return displayLogScript;
 	}

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

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