添加parentWork parentJob输出

o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/ProcessPlatform.java

@@ -53,7 +53,7 @@ public class ProcessPlatform extends ConfigObject {
 
 	public static final Boolean DEFAULT_DELETEAPPLICATIONINUSE = false;
 
-	public static final Boolean DEFAULT_UPDATEDATAPROJECTIONENABLE = false;
+//	public static final Boolean DEFAULT_UPDATEDATAPROJECTIONENABLE = false;
 
 	public static final Boolean DEFAULT_PROCESSINGSIGNALPERSISTENABLE = false;
 
@@ -73,7 +73,7 @@ public class ProcessPlatform extends ConfigObject {
 		this.docToWordDefaultSite = DEFAULT_DOCTOWORDDEFAULTSITE;
 		this.executorCount = DEFAULT_EXECUTORCOUNT;
 		this.executorQueueBusyThreshold = DEFAULT_EXECUTORQUEUEBUSYTHRESHOLD;
-		this.updateDataProjectionEnable = DEFAULT_UPDATEDATAPROJECTIONENABLE;
+//		this.updateDataProjectionEnable = DEFAULT_UPDATEDATAPROJECTIONENABLE;
 		this.urge = new Urge();
 		this.expire = new Expire();
 		this.touchDelay = new TouchDelay();
@@ -121,9 +121,9 @@ public class ProcessPlatform extends ConfigObject {
 		return StringUtils.isEmpty(docToWordDefaultSite) ? DEFAULT_DOCTOWORDDEFAULTSITE : docToWordDefaultSite;
 	}
 
-	public Boolean getUpdateDataProjectionEnable() {
-		return BooleanUtils.isTrue(this.updateDataProjectionEnable);
-	}
+//	public Boolean getUpdateDataProjectionEnable() {
+//		return BooleanUtils.isTrue(this.updateDataProjectionEnable);
+//	}
 
 	@FieldDescribe("维护身份,当工作发生意外错误,无法找到对应的处理人情况下,先尝试将工作分配给创建身份,如果创建身份也不可获取,那么分配给指定人员,默认情况下这个值为空.")
 	private String maintenanceIdentity;
@@ -152,8 +152,8 @@ public class ProcessPlatform extends ConfigObject {
 	@FieldDescribe("执行器队列繁忙阈值")
 	private Integer executorQueueBusyThreshold;
 
-	@FieldDescribe("更新data数据是否执行映射.")
-	private boolean updateDataProjectionEnable;
+//	@FieldDescribe("更新data数据是否执行映射.")
+//	private boolean updateDataProjectionEnable;
 
 	@FieldDescribe("催办任务设置,发现即将过期时发送提醒消息.")
 	private Urge urge;

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

@@ -46,6 +46,7 @@ import com.x.processplatform.core.entity.PersistenceProperties;
 import com.x.processplatform.core.entity.element.ActivityType;
 
 import io.swagger.v3.oas.annotations.media.Schema;
+
 @Schema(name = "Work", description = "流程平台工作.")
 @Entity
 @ContainerEntity(dumpSize = 200, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
@@ -112,6 +113,8 @@ public class Work extends SliceJpaObject implements ProjectionInterface {
 		this.embedTargetJob = this.getProperties().getEmbedTargetJob();
 		this.embedCompleted = this.getProperties().getEmbedCompleted();
 		this.manualTaskIdentityMatrix = this.getProperties().getManualTaskIdentityMatrix();
+		this.parentJob = this.getProperties().getParentJob();
+		this.parentWork = this.getProperties().getParentWork();
 	}
 
 	/* 更新运行方法 */
@@ -204,6 +207,25 @@ public class Work extends SliceJpaObject implements ProjectionInterface {
 		this.getProperties().setManualTaskIdentityMatrix(manualTaskIdentityMatrix);
 	}
 
+	public void setParentWork(String parentWork) {
+		this.getProperties().setParentWork(parentWork);
+		this.parentWork = parentWork;
+
+	}
+
+	public String getParentWork() {
+		return parentWork;
+	}
+
+	public void setparentJob(String parentJob) {
+		this.getProperties().setParentJob(parentJob);
+		this.parentJob = parentJob;
+	}
+
+	public String getParentJob() {
+		return parentJob;
+	}
+
 	@Transient
 	@FieldDescribe("要拆分的值")
 	private List<String> splitValueList;
@@ -221,6 +243,16 @@ public class Work extends SliceJpaObject implements ProjectionInterface {
 	@Transient
 	private ManualTaskIdentityMatrix manualTaskIdentityMatrix;
 
+	public static final String PARENTWORK_FIELDNAME = "parentWork";
+	@Transient
+	@FieldDescribe("父工作,在当前工作是通过子流程调用时产生.")
+	private String parentWork;
+
+	public static final String PARENTJOB_FIELDNAME = "parentJob";
+	@Transient
+	@FieldDescribe("父工作Job,在当前工作是通过子流程调用时产生.")
+	private String parentJob;
+
 	public static final String job_FIELDNAME = "job";
 	@FieldDescribe("工作")
 	@Column(length = JpaObject.length_id, name = ColumnNamePrefix + job_FIELDNAME)
@@ -922,8 +954,6 @@ public class Work extends SliceJpaObject implements ProjectionInterface {
 		this.activityType = activityType;
 	}
 
-
-
 	public ActivityType getDestinationActivityType() {
 		return destinationActivityType;
 	}
@@ -1295,7 +1325,7 @@ public class Work extends SliceJpaObject implements ProjectionInterface {
 	public void setManualTaskIdentityList(List<String> manualTaskIdentityList) {
 		this.manualTaskIdentityList = manualTaskIdentityList;
 	}
-	
+
 	public List<String> getManualTaskIdentityList() {
 		return manualTaskIdentityList;
 	}

o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/BaseAction.java

@@ -245,14 +245,12 @@ abstract class BaseAction extends StandardJaxrsAction {
 			// 标记数据已经被修改
 			business.entityManagerContainer().beginTransaction(Work.class);
 			work.setDataChanged(true);
-			if (BooleanUtils.isTrue(Config.processPlatform().getUpdateDataProjectionEnable())) {
-				business.entityManagerContainer().beginTransaction(Task.class);
-				business.entityManagerContainer().beginTransaction(TaskCompleted.class);
-				business.entityManagerContainer().beginTransaction(Read.class);
-				business.entityManagerContainer().beginTransaction(ReadCompleted.class);
-				business.entityManagerContainer().beginTransaction(Review.class);
-				projection(business, work, XGsonBuilder.convert(jsonObject, Data.class));
-			}
+			business.entityManagerContainer().beginTransaction(Task.class);
+			business.entityManagerContainer().beginTransaction(TaskCompleted.class);
+			business.entityManagerContainer().beginTransaction(Read.class);
+			business.entityManagerContainer().beginTransaction(ReadCompleted.class);
+			business.entityManagerContainer().beginTransaction(Review.class);
+			projection(business, work, XGsonBuilder.convert(jsonObject, Data.class));
 			// 基于前面的原因,这里进行单独提交
 			business.entityManagerContainer().commit();
 		}
@@ -284,15 +282,13 @@ abstract class BaseAction extends StandardJaxrsAction {
 				this.fill(_o, workCompleted);
 				business.entityManagerContainer().persist(_o);
 			}
-			if (BooleanUtils.isTrue(Config.processPlatform().getUpdateDataProjectionEnable())) {
-				business.entityManagerContainer().beginTransaction(WorkCompleted.class);
-				business.entityManagerContainer().beginTransaction(Task.class);
-				business.entityManagerContainer().beginTransaction(TaskCompleted.class);
-				business.entityManagerContainer().beginTransaction(Read.class);
-				business.entityManagerContainer().beginTransaction(ReadCompleted.class);
-				business.entityManagerContainer().beginTransaction(Review.class);
-				projection(business, workCompleted, XGsonBuilder.convert(jsonObject, Data.class));
-			}
+			business.entityManagerContainer().beginTransaction(WorkCompleted.class);
+			business.entityManagerContainer().beginTransaction(Task.class);
+			business.entityManagerContainer().beginTransaction(TaskCompleted.class);
+			business.entityManagerContainer().beginTransaction(Read.class);
+			business.entityManagerContainer().beginTransaction(ReadCompleted.class);
+			business.entityManagerContainer().beginTransaction(Review.class);
+			projection(business, workCompleted, XGsonBuilder.convert(jsonObject, Data.class));
 			// 基于前面的原因,这里进行单独提交
 			business.entityManagerContainer().commit();
 
@@ -353,14 +349,12 @@ abstract class BaseAction extends StandardJaxrsAction {
 		// 标记数据已经被修改
 		business.entityManagerContainer().beginTransaction(Work.class);
 		work.setDataChanged(true);
-		if (BooleanUtils.isTrue(Config.processPlatform().getUpdateDataProjectionEnable())) {
-			business.entityManagerContainer().beginTransaction(Task.class);
-			business.entityManagerContainer().beginTransaction(TaskCompleted.class);
-			business.entityManagerContainer().beginTransaction(Read.class);
-			business.entityManagerContainer().beginTransaction(ReadCompleted.class);
-			business.entityManagerContainer().beginTransaction(Review.class);
-			projection(business, work, XGsonBuilder.convert(jsonElement, Data.class));
-		}
+		business.entityManagerContainer().beginTransaction(Task.class);
+		business.entityManagerContainer().beginTransaction(TaskCompleted.class);
+		business.entityManagerContainer().beginTransaction(Read.class);
+		business.entityManagerContainer().beginTransaction(ReadCompleted.class);
+		business.entityManagerContainer().beginTransaction(Review.class);
+		projection(business, work, XGsonBuilder.convert(jsonElement, Data.class));
 		business.entityManagerContainer().commit();
 	}