提交 9d487b08 编写于 作者: Z zhourui

fix

上级 e75b540c
...@@ -9,6 +9,11 @@ import javax.persistence.PostLoad; ...@@ -9,6 +9,11 @@ import javax.persistence.PostLoad;
import javax.persistence.Table; import javax.persistence.Table;
import javax.persistence.UniqueConstraint; 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.JpaObject;
import com.x.base.core.entity.SliceJpaObject; import com.x.base.core.entity.SliceJpaObject;
import com.x.base.core.entity.annotation.CheckPersist; import com.x.base.core.entity.annotation.CheckPersist;
...@@ -17,11 +22,6 @@ import com.x.base.core.project.annotation.FieldDescribe; ...@@ -17,11 +22,6 @@ import com.x.base.core.project.annotation.FieldDescribe;
import com.x.base.core.project.tools.StringTools; import com.x.base.core.project.tools.StringTools;
import com.x.processplatform.core.entity.PersistenceProperties; 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 @Entity
@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong) @ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
@Table(name = PersistenceProperties.Content.Draft.table, uniqueConstraints = { @Table(name = PersistenceProperties.Content.Draft.table, uniqueConstraints = {
...@@ -88,6 +88,10 @@ public class Draft extends SliceJpaObject { ...@@ -88,6 +88,10 @@ public class Draft extends SliceJpaObject {
return this.properties; return this.properties;
} }
public void setProperties(DraftProperties properties) {
this.properties = properties;
}
public static final String title_FIELDNAME = "title"; public static final String title_FIELDNAME = "title";
@FieldDescribe("标题.") @FieldDescribe("标题.")
@Column(length = length_255B, name = ColumnNamePrefix + title_FIELDNAME) @Column(length = length_255B, name = ColumnNamePrefix + title_FIELDNAME)
...@@ -238,6 +242,4 @@ public class Draft extends SliceJpaObject { ...@@ -238,6 +242,4 @@ public class Draft extends SliceJpaObject {
this.unit = unit; this.unit = unit;
} }
} }
\ No newline at end of file
...@@ -169,6 +169,10 @@ public class ReadCompleted extends SliceJpaObject implements ProjectionInterface ...@@ -169,6 +169,10 @@ public class ReadCompleted extends SliceJpaObject implements ProjectionInterface
} }
return this.properties; return this.properties;
} }
public void setProperties(ReadCompletedProperties properties) {
this.properties = properties;
}
public static final String job_FIELDNAME = "job"; public static final String job_FIELDNAME = "job";
@FieldDescribe("任务.") @FieldDescribe("任务.")
......
...@@ -13,6 +13,11 @@ import javax.persistence.Temporal; ...@@ -13,6 +13,11 @@ import javax.persistence.Temporal;
import javax.persistence.TemporalType; import javax.persistence.TemporalType;
import javax.persistence.UniqueConstraint; 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.AbstractPersistenceProperties;
import com.x.base.core.entity.JpaObject; import com.x.base.core.entity.JpaObject;
import com.x.base.core.entity.SliceJpaObject; import com.x.base.core.entity.SliceJpaObject;
...@@ -23,11 +28,6 @@ import com.x.base.core.project.tools.DateTools; ...@@ -23,11 +28,6 @@ import com.x.base.core.project.tools.DateTools;
import com.x.base.core.project.tools.StringTools; import com.x.base.core.project.tools.StringTools;
import com.x.processplatform.core.entity.PersistenceProperties; 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 @Entity
@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong) @ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong)
@Table(name = PersistenceProperties.Content.Review.table, uniqueConstraints = { @Table(name = PersistenceProperties.Content.Review.table, uniqueConstraints = {
...@@ -152,6 +152,10 @@ public class Review extends SliceJpaObject implements ProjectionInterface { ...@@ -152,6 +152,10 @@ public class Review extends SliceJpaObject implements ProjectionInterface {
return this.properties; return this.properties;
} }
public void setProperties(ReviewProperties properties) {
this.properties = properties;
}
public static final String job_FIELDNAME = "job"; public static final String job_FIELDNAME = "job";
@FieldDescribe("任务.") @FieldDescribe("任务.")
@Column(length = JpaObject.length_id, name = ColumnNamePrefix + job_FIELDNAME) @Column(length = JpaObject.length_id, name = ColumnNamePrefix + job_FIELDNAME)
...@@ -956,5 +960,4 @@ public class Review extends SliceJpaObject implements ProjectionInterface { ...@@ -956,5 +960,4 @@ public class Review extends SliceJpaObject implements ProjectionInterface {
return stringValue01_FIELDNAME; return stringValue01_FIELDNAME;
} }
} }
\ No newline at end of file
...@@ -178,6 +178,10 @@ public class Task extends SliceJpaObject implements ProjectionInterface { ...@@ -178,6 +178,10 @@ public class Task extends SliceJpaObject implements ProjectionInterface {
return this.properties; return this.properties;
} }
public void setProperties(TaskProperties properties) {
this.properties = properties;
}
public static final String job_FIELDNAME = "job"; public static final String job_FIELDNAME = "job";
@FieldDescribe("任务.") @FieldDescribe("任务.")
@Column(length = JpaObject.length_id, name = ColumnNamePrefix + job_FIELDNAME) @Column(length = JpaObject.length_id, name = ColumnNamePrefix + job_FIELDNAME)
...@@ -1280,10 +1284,6 @@ public class Task extends SliceJpaObject implements ProjectionInterface { ...@@ -1280,10 +1284,6 @@ public class Task extends SliceJpaObject implements ProjectionInterface {
this.workCreateType = workCreateType; this.workCreateType = workCreateType;
} }
public void setProperties(TaskProperties properties) {
this.properties = properties;
}
public String getSeries() { public String getSeries() {
return series; return series;
} }
......
...@@ -19,6 +19,12 @@ import javax.persistence.Temporal; ...@@ -19,6 +19,12 @@ import javax.persistence.Temporal;
import javax.persistence.TemporalType; import javax.persistence.TemporalType;
import javax.persistence.UniqueConstraint; 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.JpaObject;
import com.x.base.core.entity.SliceJpaObject; import com.x.base.core.entity.SliceJpaObject;
import com.x.base.core.entity.annotation.CheckPersist; import com.x.base.core.entity.annotation.CheckPersist;
...@@ -32,12 +38,6 @@ import com.x.processplatform.core.entity.content.TaskCompletedProperties.PrevTas ...@@ -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.ActivityType;
import com.x.processplatform.core.entity.element.Route; 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 ...@@ -111,18 +111,18 @@ public class TaskCompleted extends SliceJpaObject implements ProjectionInterface
this.processingType = PROCESSINGTYPE_TASK; this.processingType = PROCESSINGTYPE_TASK;
} }
switch (this.processingType) { switch (this.processingType) {
case PROCESSINGTYPE_APPENDTASK: case PROCESSINGTYPE_APPENDTASK:
case PROCESSINGTYPE_BEAPPENDEDTASK: case PROCESSINGTYPE_BEAPPENDEDTASK:
case PROCESSINGTYPE_REROUTE: case PROCESSINGTYPE_REROUTE:
case PROCESSINGTYPE_RETRACT: case PROCESSINGTYPE_RETRACT:
case PROCESSINGTYPE_ROLLBACK: case PROCESSINGTYPE_ROLLBACK:
case PROCESSINGTYPE_EMPOWER: case PROCESSINGTYPE_EMPOWER:
case PROCESSINGTYPE_RESET: case PROCESSINGTYPE_RESET:
this.joinInquire = false; this.joinInquire = false;
break; break;
default: default:
this.joinInquire = true; this.joinInquire = true;
break; break;
} }
if (StringTools.utf8Length(this.getProperties().getTitle()) > length_255B) { if (StringTools.utf8Length(this.getProperties().getTitle()) > length_255B) {
...@@ -345,6 +345,10 @@ public class TaskCompleted extends SliceJpaObject implements ProjectionInterface ...@@ -345,6 +345,10 @@ public class TaskCompleted extends SliceJpaObject implements ProjectionInterface
return this.properties; return this.properties;
} }
public void setProperties(TaskCompletedProperties properties) {
this.properties = properties;
}
public static final String job_FIELDNAME = "job"; public static final String job_FIELDNAME = "job";
@FieldDescribe("任务.") @FieldDescribe("任务.")
@Column(length = JpaObject.length_id, name = ColumnNamePrefix + job_FIELDNAME) @Column(length = JpaObject.length_id, name = ColumnNamePrefix + job_FIELDNAME)
...@@ -1486,8 +1490,6 @@ public class TaskCompleted extends SliceJpaObject implements ProjectionInterface ...@@ -1486,8 +1490,6 @@ public class TaskCompleted extends SliceJpaObject implements ProjectionInterface
this.empowerFromIdentity = empowerFromIdentity; this.empowerFromIdentity = empowerFromIdentity;
} }
public String getProcessingType() { public String getProcessingType() {
return processingType; return processingType;
} }
......
...@@ -129,6 +129,10 @@ public class Work extends SliceJpaObject implements ProjectionInterface { ...@@ -129,6 +129,10 @@ public class Work extends SliceJpaObject implements ProjectionInterface {
return this.properties; return this.properties;
} }
public void setProperties(WorkProperties properties) {
this.properties = properties;
}
public void setTitle(String title) { public void setTitle(String title) {
this.title = title; this.title = title;
this.getProperties().setTitle(title); this.getProperties().setTitle(title);
...@@ -1268,8 +1272,6 @@ public class Work extends SliceJpaObject implements ProjectionInterface { ...@@ -1268,8 +1272,6 @@ public class Work extends SliceJpaObject implements ProjectionInterface {
this.workCreateType = workCreateType; this.workCreateType = workCreateType;
} }
public void setManualTaskIdentityList(List<String> manualTaskIdentityList) { public void setManualTaskIdentityList(List<String> manualTaskIdentityList) {
this.manualTaskIdentityList = manualTaskIdentityList; this.manualTaskIdentityList = manualTaskIdentityList;
} }
......
...@@ -137,6 +137,10 @@ public class WorkCompleted extends SliceJpaObject implements ProjectionInterface ...@@ -137,6 +137,10 @@ public class WorkCompleted extends SliceJpaObject implements ProjectionInterface
} }
return this.properties; return this.properties;
} }
public void setProperties(WorkCompletedProperties properties) {
this.properties = properties;
}
public void setTitle(String title) { public void setTitle(String title) {
this.title = title; this.title = title;
......
...@@ -103,6 +103,10 @@ public class WorkLog extends SliceJpaObject { ...@@ -103,6 +103,10 @@ public class WorkLog extends SliceJpaObject {
return this.properties; return this.properties;
} }
public void setProperties(WorkLogProperties properties) {
this.properties = properties;
}
public static final String job_FIELDNAME = "job"; public static final String job_FIELDNAME = "job";
@FieldDescribe("任务标识") @FieldDescribe("任务标识")
@Column(length = JpaObject.length_id, name = ColumnNamePrefix + job_FIELDNAME) @Column(length = JpaObject.length_id, name = ColumnNamePrefix + job_FIELDNAME)
...@@ -650,8 +654,4 @@ public class WorkLog extends SliceJpaObject { ...@@ -650,8 +654,4 @@ public class WorkLog extends SliceJpaObject {
return arrivedOpinionGroup_FIELDNAME; return arrivedOpinionGroup_FIELDNAME;
} }
public void setProperties(WorkLogProperties properties) {
this.properties = properties;
}
} }
\ No newline at end of file
...@@ -33,6 +33,7 @@ import com.x.base.core.entity.annotation.IdReference; ...@@ -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.entity.annotation.RestrictFlag;
import com.x.base.core.project.annotation.FieldDescribe; import com.x.base.core.project.annotation.FieldDescribe;
import com.x.processplatform.core.entity.PersistenceProperties; import com.x.processplatform.core.entity.PersistenceProperties;
import com.x.processplatform.core.entity.content.WorkLogProperties;
@Entity @Entity
@ContainerEntity(dumpSize = 5, type = ContainerEntity.Type.element, reference = ContainerEntity.Reference.strong) @ContainerEntity(dumpSize = 5, type = ContainerEntity.Type.element, reference = ContainerEntity.Reference.strong)
...@@ -104,6 +105,10 @@ public class Form extends SliceJpaObject { ...@@ -104,6 +105,10 @@ public class Form extends SliceJpaObject {
} }
return this.properties; return this.properties;
} }
public void setProperties(FormProperties properties) {
this.properties = properties;
}
public String getDataOrMobileData() { public String getDataOrMobileData() {
if (StringUtils.isNotEmpty(this.getData())) { if (StringUtils.isNotEmpty(this.getData())) {
......
...@@ -68,7 +68,6 @@ public class Manual extends Activity { ...@@ -68,7 +68,6 @@ public class Manual extends Activity {
@PostLoad @PostLoad
public void postLoad() { public void postLoad() {
// this.asyncSupported = this.getProperties().getAsyncSupported();
} }
public Manual() { public Manual() {
...@@ -82,17 +81,9 @@ public class Manual extends Activity { ...@@ -82,17 +81,9 @@ public class Manual extends Activity {
return this.properties; return this.properties;
} }
// public Boolean getAsyncSupported() { public void setProperties(ManualProperties properties) {
// return asyncSupported; this.properties = properties;
// } }
//
// public void setAsyncSupported(Boolean asyncSupported) {
// this.asyncSupported = asyncSupported;
// this.getProperties().setAsyncSupported(asyncSupported);
// }
//
// @Transient
// private Boolean asyncSupported;
@FieldDescribe("分组") @FieldDescribe("分组")
@CheckPersist(allowEmpty = true) @CheckPersist(allowEmpty = true)
...@@ -636,8 +627,6 @@ public class Manual extends Activity { ...@@ -636,8 +627,6 @@ public class Manual extends Activity {
@CheckPersist(allowEmpty = true) @CheckPersist(allowEmpty = true)
private ManualProperties properties; private ManualProperties properties;
public String getDisplayLogScript() { public String getDisplayLogScript() {
return displayLogScript; return displayLogScript;
} }
......
...@@ -85,6 +85,10 @@ public class Route extends SliceJpaObject { ...@@ -85,6 +85,10 @@ public class Route extends SliceJpaObject {
return this.properties; return this.properties;
} }
public void setProperties(RouteProperties properties) {
this.properties = properties;
}
public Boolean getAsyncSupported() { public Boolean getAsyncSupported() {
return asyncSupported; return asyncSupported;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册