提交 afb53fd7 编写于 作者: J Joram Barrez

Cmmn: add scope identifier and type to task service (similar to variables)

上级 e583f216
......@@ -68,7 +68,7 @@ public class ManagementServiceTest extends PluggableFlowableTestCase {
TableMetaData tableMetaData = managementService.getTableMetaData(tablePrefix + "ACT_RU_TASK");
assertEquals(tableMetaData.getColumnNames().size(), tableMetaData.getColumnTypes().size());
assertEquals(23, tableMetaData.getColumnNames().size());
assertEquals(27, tableMetaData.getColumnNames().size());
int assigneeIndex = tableMetaData.getColumnNames().indexOf("ASSIGNEE_");
int createTimeIndex = tableMetaData.getColumnNames().indexOf("CREATE_TIME_");
......
......@@ -65,6 +65,26 @@ public interface TaskInfo {
* Reference to the process definition or null if it is not related to a process.
*/
String getProcessDefinitionId();
/**
* Reference to a scope identifier or null if none is set (e.g. for bpmn process task it is null)
*/
String getScopeId();
/**
* Reference to a sub scope identifier or null if none is set (e.g. for bpmn process task it is null)
*/
String getSubScopeId();
/**
* Reference to a scope type or null if none is set (e.g. for bpmn process task it is null)
*/
String getScopeType();
/**
* Reference to a scope definition identifier or null if none is set (e.g. for bpmn process task it is null)
*/
String getScopeDefinitionId();
/** The date/time when this task was created */
Date getCreateTime();
......
......@@ -196,6 +196,26 @@ public interface TaskInfoQuery<T extends TaskInfoQuery<?, ?>, V extends TaskInfo
* Only select tasks for the given execution.
*/
T executionId(String executionId);
/**
* Only select tasks for the given scope identifier.
*/
T scopeId(String scopeId);
/**
* Only select tasks for the given sub scope identifier.
*/
T subScopeId(String subScopeId);
/**
* Only select tasks for the given scope type.
*/
T scopeType(String scopeType);
/**
* Only select tasks for the given scope definition identifier.
*/
T scopeDefinitionId(String scopeDefinitionId);
/**
* Only select tasks that are created on the given date.
......
......@@ -33,6 +33,7 @@ import org.flowable.variable.service.impl.types.VariableTypes;
/**
* @author Tom Baeyens
* @author Joram Barrez
*/
public class HistoricTaskInstanceQueryImpl extends AbstractVariableQueryImpl<HistoricTaskInstanceQuery, HistoricTaskInstance> implements HistoricTaskInstanceQuery {
......@@ -54,6 +55,10 @@ public class HistoricTaskInstanceQueryImpl extends AbstractVariableQueryImpl<His
protected String processInstanceBusinessKeyLike;
protected String processInstanceBusinessKeyLikeIgnoreCase;
protected String executionId;
protected String scopeId;
protected String subScopeId;
protected String scopeType;
protected String scopeDefinitionId;
protected String taskId;
protected String taskName;
protected String taskNameLike;
......@@ -221,6 +226,46 @@ public class HistoricTaskInstanceQueryImpl extends AbstractVariableQueryImpl<His
}
return this;
}
@Override
public HistoricTaskInstanceQueryImpl scopeId(String scopeId) {
if (inOrStatement) {
currentOrQueryObject.scopeId = scopeId;
} else {
this.scopeId = scopeId;
}
return this;
}
@Override
public HistoricTaskInstanceQueryImpl subScopeId(String subScopeId) {
if (inOrStatement) {
currentOrQueryObject.subScopeId = subScopeId;
} else {
this.subScopeId = subScopeId;
}
return this;
}
@Override
public HistoricTaskInstanceQueryImpl scopeType(String scopeType) {
if (inOrStatement) {
currentOrQueryObject.scopeType = scopeType;
} else {
this.scopeType = scopeType;
}
return this;
}
@Override
public HistoricTaskInstanceQueryImpl scopeDefinitionId(String scopeDefinitionId) {
if (inOrStatement) {
currentOrQueryObject.scopeDefinitionId = scopeDefinitionId;
} else {
this.scopeDefinitionId = scopeDefinitionId;
}
return this;
}
@Override
public HistoricTaskInstanceQueryImpl processDefinitionId(String processDefinitionId) {
......@@ -1398,6 +1443,22 @@ public class HistoricTaskInstanceQueryImpl extends AbstractVariableQueryImpl<His
public String getExecutionId() {
return executionId;
}
public String getScopeId() {
return scopeId;
}
public String getSubScopeId() {
return subScopeId;
}
public String getScopeType() {
return scopeType;
}
public String getScopeDefinitionId() {
return scopeDefinitionId;
}
public String getProcessDefinitionId() {
return processDefinitionId;
......
......@@ -74,6 +74,10 @@ public class TaskQueryImpl extends AbstractVariableQueryImpl<TaskQuery, Task> im
protected String processInstanceId;
protected List<String> processInstanceIds;
protected String executionId;
protected String scopeId;
protected String subScopeId;
protected String scopeType;
protected String scopeDefinitionId;
protected Date createTime;
protected Date createTimeBefore;
protected Date createTimeAfter;
......@@ -668,6 +672,46 @@ public class TaskQueryImpl extends AbstractVariableQueryImpl<TaskQuery, Task> im
}
return this;
}
@Override
public TaskQueryImpl scopeId(String scopeId) {
if (orActive) {
currentOrQueryObject.scopeId = scopeId;
} else {
this.scopeId = scopeId;
}
return this;
}
@Override
public TaskQueryImpl subScopeId(String subScopeId) {
if (orActive) {
currentOrQueryObject.subScopeId = subScopeId;
} else {
this.subScopeId = subScopeId;
}
return this;
}
@Override
public TaskQueryImpl scopeType(String scopeType) {
if (orActive) {
currentOrQueryObject.scopeType = scopeType;
} else {
this.scopeType = scopeType;
}
return this;
}
@Override
public TaskQueryImpl scopeDefinitionId(String scopeDefinitionId) {
if (orActive) {
currentOrQueryObject.scopeDefinitionId = scopeDefinitionId;
} else {
this.scopeDefinitionId = scopeDefinitionId;
}
return this;
}
@Override
public TaskQueryImpl taskCreatedOn(Date createTime) {
......@@ -1464,6 +1508,22 @@ public class TaskQueryImpl extends AbstractVariableQueryImpl<TaskQuery, Task> im
public String getExecutionId() {
return executionId;
}
public String getScopeId() {
return scopeId;
}
public String getSubScopeId() {
return subScopeId;
}
public String getScopeType() {
return scopeType;
}
public String getScopeDefinitionId() {
return scopeDefinitionId;
}
public String getTaskId() {
return taskId;
......
......@@ -69,24 +69,17 @@ public interface HistoricTaskInstanceEntity extends Entity, HistoricTaskInstance
void markEnded(String deleteReason);
@Override
String getProcessInstanceId();
@Override
String getProcessDefinitionId();
void setProcessInstanceId(String processInstanceId);
@Override
Date getStartTime();
void setProcessDefinitionId(String processDefinitionId);
@Override
Date getEndTime();
void setScopeId(String scopeId);
@Override
Long getDurationInMillis();
void setSubScopeId(String subScopeId);
void setProcessInstanceId(String processInstanceId);
void setScopeType(String scopeType);
void setProcessDefinitionId(String processDefinitionId);
void setScopeDefinitionId(String scopeDefinitionId);
void setStartTime(Date startTime);
......@@ -94,9 +87,6 @@ public interface HistoricTaskInstanceEntity extends Entity, HistoricTaskInstance
void setDurationInMillis(Long durationInMillis);
@Override
String getDeleteReason();
void setDeleteReason(String deleteReason);
}
......@@ -39,6 +39,10 @@ public class HistoricTaskInstanceEntityImpl extends AbstractEntity implements Hi
protected String executionId;
protected String processInstanceId;
protected String processDefinitionId;
protected String scopeId;
protected String subScopeId;
protected String scopeType;
protected String scopeDefinitionId;
protected Date startTime;
protected Date endTime;
protected Long durationInMillis;
......@@ -72,6 +76,10 @@ public class HistoricTaskInstanceEntityImpl extends AbstractEntity implements Hi
this.processDefinitionId = task.getProcessDefinitionId();
this.processInstanceId = task.getProcessInstanceId();
this.executionId = task.getExecutionId();
this.scopeId = task.getScopeId();
this.subScopeId = task.getSubScopeId();
this.scopeType = task.getScopeType();
this.scopeDefinitionId = task.getScopeDefinitionId();
this.name = task.getName();
this.parentTaskId = task.getParentTaskId();
this.description = task.getDescription();
......@@ -109,6 +117,10 @@ public class HistoricTaskInstanceEntityImpl extends AbstractEntity implements Hi
persistentState.put("category", category);
persistentState.put("executionId", executionId);
persistentState.put("processDefinitionId", processDefinitionId);
persistentState.put("scopeId", scopeId);
persistentState.put("subScopeId", subScopeId);
persistentState.put("scopeType", scopeType);
persistentState.put("scopeDefinitionId", scopeDefinitionId);
persistentState.put("parentTaskId", parentTaskId);
persistentState.put("dueDate", dueDate);
persistentState.put("claimTime", claimTime);
......@@ -148,6 +160,46 @@ public class HistoricTaskInstanceEntityImpl extends AbstractEntity implements Hi
public String getProcessDefinitionId() {
return processDefinitionId;
}
@Override
public String getScopeId() {
return scopeId;
}
@Override
public void setScopeId(String scopeId) {
this.scopeId = scopeId;
}
@Override
public String getSubScopeId() {
return subScopeId;
}
@Override
public void setSubScopeId(String subScopeId) {
this.subScopeId = subScopeId;
}
@Override
public String getScopeType() {
return scopeType;
}
@Override
public void setScopeType(String scopeType) {
this.scopeType = scopeType;
}
@Override
public String getScopeDefinitionId() {
return scopeDefinitionId;
}
@Override
public void setScopeDefinitionId(String scopeDefinitionId) {
this.scopeDefinitionId = scopeDefinitionId;
}
@Override
public Date getStartTime() {
......
......@@ -44,6 +44,14 @@ public interface TaskEntity extends VariableScope, Task, DelegateTask, Entity, H
void setEventHandlerId(String eventHandlerId);
void setProcessInstanceId(String processInstanceId);
void setScopeId(String scopeId);
void setSubScopeId(String subScopeId);
void setScopeType(String scopeType);
void setScopeDefinitionId(String scopeDefinitionId);
int getSuspensionState();
......
......@@ -75,10 +75,13 @@ public class TaskEntityImpl extends VariableScopeImpl implements TaskEntity, Cou
protected List<IdentityLinkEntity> taskIdentityLinkEntities = new ArrayList<>();
protected String executionId;
protected String processInstanceId;
protected String processDefinitionId;
protected String scopeId;
protected String subScopeId;
protected String scopeType;
protected String scopeDefinitionId;
protected String taskDefinitionKey;
protected String formKey;
......@@ -119,9 +122,24 @@ public class TaskEntityImpl extends VariableScopeImpl implements TaskEntity, Cou
if (executionId != null) {
persistentState.put("executionId", this.executionId);
}
if (processInstanceId != null) {
persistentState.put("processInstanceId", this.processInstanceId);
}
if (processDefinitionId != null) {
persistentState.put("processDefinitionId", this.processDefinitionId);
}
if (scopeId != null) {
persistentState.put("scopeId", this.scopeId);
}
if (subScopeId != null) {
persistentState.put("subScopeId", this.subScopeId);
}
if (scopeType != null) {
persistentState.put("scopeType", this.scopeType);
}
if (scopeDefinitionId != null) {
persistentState.put("scopeDefinitionId", this.scopeDefinitionId);
}
if (createTime != null) {
persistentState.put("createTime", this.createTime);
}
......@@ -416,6 +434,46 @@ public class TaskEntityImpl extends VariableScopeImpl implements TaskEntity, Cou
public void setProcessDefinitionId(String processDefinitionId) {
this.processDefinitionId = processDefinitionId;
}
@Override
public String getScopeId() {
return scopeId;
}
@Override
public void setScopeId(String scopeId) {
this.scopeId = scopeId;
}
@Override
public String getSubScopeId() {
return subScopeId;
}
@Override
public void setSubScopeId(String subScopeId) {
this.subScopeId = subScopeId;
}
@Override
public String getScopeType() {
return scopeType;
}
@Override
public void setScopeType(String scopeType) {
this.scopeType = scopeType;
}
@Override
public String getScopeDefinitionId() {
return scopeDefinitionId;
}
@Override
public void setScopeDefinitionId(String scopeDefinitionId) {
this.scopeDefinitionId = scopeDefinitionId;
}
@Override
public String getAssignee() {
......
......@@ -5,6 +5,10 @@ create table ACT_HI_TASKINST (
TASK_DEF_KEY_ varchar(255),
PROC_INST_ID_ varchar(64),
EXECUTION_ID_ varchar(64),
SCOPE_ID_ varchar(255),
SUB_SCOPE_ID_ varchar(255),
SCOPE_TYPE_ varchar(255),
SCOPE_DEFINITION_ID_ varchar(255),
NAME_ varchar(255),
PARENT_TASK_ID_ varchar(64),
DESCRIPTION_ varchar(4000),
......@@ -22,4 +26,8 @@ create table ACT_HI_TASKINST (
TENANT_ID_ varchar(255) default '',
LAST_UPDATED_TIME_ timestamp,
primary key (ID_)
);
\ No newline at end of file
);
create index ACT_IDX_HI_TASK_SCOPE on ACT_HI_TASKINST(SCOPE_ID_, SCOPE_TYPE_);
create index ACT_IDX_HI_TASK_SUB_SCOPE on ACT_HI_TASKINST(SUB_SCOPE_ID_, SCOPE_TYPE_);
create index ACT_IDX_HI_TASK_SCOPE_DEF on ACT_HI_TASKINST(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
......@@ -4,6 +4,10 @@ create table ACT_RU_TASK (
EXECUTION_ID_ varchar(64),
PROC_INST_ID_ varchar(64),
PROC_DEF_ID_ varchar(64),
SCOPE_ID_ varchar(255),
SUB_SCOPE_ID_ varchar(255),
SCOPE_TYPE_ varchar(255),
SCOPE_DEFINITION_ID_ varchar(255),
NAME_ varchar(255),
PARENT_TASK_ID_ varchar(64),
DESCRIPTION_ varchar(4000),
......@@ -26,5 +30,8 @@ create table ACT_RU_TASK (
);
create index ACT_IDX_TASK_CREATE on ACT_RU_TASK(CREATE_TIME_);
create index ACT_IDX_TASK_SCOPE on ACT_RU_TASK(SCOPE_ID_, SCOPE_TYPE_);
create index ACT_IDX_TASK_SUB_SCOPE on ACT_RU_TASK(SUB_SCOPE_ID_, SCOPE_TYPE_);
create index ACT_IDX_TASK_SCOPE_DEF on ACT_RU_TASK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
insert into ACT_GE_PROPERTY values ('task.schema.version', '6.2.0.0', 1);
\ No newline at end of file
......@@ -5,6 +5,10 @@ create table ACT_HI_TASKINST (
TASK_DEF_KEY_ varchar(255),
PROC_INST_ID_ varchar(64),
EXECUTION_ID_ varchar(64),
SCOPE_ID_ varchar(255),
SUB_SCOPE_ID_ varchar(255),
SCOPE_TYPE_ varchar(255),
SCOPE_DEFINITION_ID_ varchar(255),
NAME_ varchar(255),
PARENT_TASK_ID_ varchar(64),
DESCRIPTION_ varchar(4000),
......@@ -22,4 +26,8 @@ create table ACT_HI_TASKINST (
TENANT_ID_ varchar(255) default '',
LAST_UPDATED_TIME_ timestamp,
primary key (ID_)
);
\ No newline at end of file
);
create index ACT_IDX_HI_TASK_SCOPE on ACT_HI_TASKINST(SCOPE_ID_, SCOPE_TYPE_);
create index ACT_IDX_HI_TASK_SUB_SCOPE on ACT_HI_TASKINST(SUB_SCOPE_ID_, SCOPE_TYPE_);
create index ACT_IDX_HI_TASK_SCOPE_DEF on ACT_HI_TASKINST(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
......@@ -4,6 +4,10 @@ create table ACT_RU_TASK (
EXECUTION_ID_ varchar(64),
PROC_INST_ID_ varchar(64),
PROC_DEF_ID_ varchar(64),
SCOPE_ID_ varchar(255),
SUB_SCOPE_ID_ varchar(255),
SCOPE_TYPE_ varchar(255),
SCOPE_DEFINITION_ID_ varchar(255),
NAME_ varchar(255),
PARENT_TASK_ID_ varchar(64),
DESCRIPTION_ varchar(4000),
......@@ -26,5 +30,8 @@ create table ACT_RU_TASK (
);
create index ACT_IDX_TASK_CREATE on ACT_RU_TASK(CREATE_TIME_);
create index ACT_IDX_TASK_SCOPE on ACT_RU_TASK(SCOPE_ID_, SCOPE_TYPE_);
create index ACT_IDX_TASK_SUB_SCOPE on ACT_RU_TASK(SUB_SCOPE_ID_, SCOPE_TYPE_);
create index ACT_IDX_TASK_SCOPE_DEF on ACT_RU_TASK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
insert into ACT_GE_PROPERTY values ('task.schema.version', '6.2.0.0', 1);
\ No newline at end of file
create table ACT_HI_TASKINST (
ID_ varchar(64) not null,
REV_ integer default 1,
PROC_DEF_ID_ varchar(64),
TASK_DEF_KEY_ varchar(255),
PROC_INST_ID_ varchar(64),
EXECUTION_ID_ varchar(64),
NAME_ varchar(255),
PARENT_TASK_ID_ varchar(64),
DESCRIPTION_ varchar(4000),
OWNER_ varchar(255),
ASSIGNEE_ varchar(255),
START_TIME_ timestamp not null,
CLAIM_TIME_ timestamp,
END_TIME_ timestamp,
DURATION_ bigint,
DELETE_REASON_ varchar(4000),
PRIORITY_ integer,
DUE_DATE_ timestamp,
FORM_KEY_ varchar(255),
CATEGORY_ varchar(255),
TENANT_ID_ varchar(255) default '',
LAST_UPDATED_TIME_ timestamp,
primary key (ID_)
);
\ No newline at end of file
ID_ varchar(64) not null,
REV_ integer default 1,
PROC_DEF_ID_ varchar(64),
TASK_DEF_KEY_ varchar(255),
PROC_INST_ID_ varchar(64),
EXECUTION_ID_ varchar(64),
SCOPE_ID_ varchar(255),
SUB_SCOPE_ID_ varchar(255),
SCOPE_TYPE_ varchar(255),
SCOPE_DEFINITION_ID_ varchar(255),
NAME_ varchar(255),
PARENT_TASK_ID_ varchar(64),
DESCRIPTION_ varchar(4000),
OWNER_ varchar(255),
ASSIGNEE_ varchar(255),
START_TIME_ timestamp not null,
CLAIM_TIME_ timestamp,
END_TIME_ timestamp,
DURATION_ bigint,
DELETE_REASON_ varchar(4000),
PRIORITY_ integer,
DUE_DATE_ timestamp,
FORM_KEY_ varchar(255),
CATEGORY_ varchar(255),
TENANT_ID_ varchar(255) default '',
LAST_UPDATED_TIME_ timestamp,
primary key (ID_)
);
create index ACT_IDX_HI_TASK_SCOPE on ACT_HI_TASKINST(SCOPE_ID_, SCOPE_TYPE_);
create index ACT_IDX_HI_TASK_SUB_SCOPE on ACT_HI_TASKINST(SUB_SCOPE_ID_, SCOPE_TYPE_);
create index ACT_IDX_HI_TASK_SCOPE_DEF on ACT_HI_TASKINST(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
......@@ -4,6 +4,10 @@ create table ACT_RU_TASK (
EXECUTION_ID_ varchar(64),
PROC_INST_ID_ varchar(64),
PROC_DEF_ID_ varchar(64),
SCOPE_ID_ varchar(255),
SUB_SCOPE_ID_ varchar(255),
SCOPE_TYPE_ varchar(255),
SCOPE_DEFINITION_ID_ varchar(255),
NAME_ varchar(255),
PARENT_TASK_ID_ varchar(64),
DESCRIPTION_ varchar(4000),
......@@ -26,5 +30,8 @@ create table ACT_RU_TASK (
);
create index ACT_IDX_TASK_CREATE on ACT_RU_TASK(CREATE_TIME_);
create index ACT_IDX_TASK_SCOPE on ACT_RU_TASK(SCOPE_ID_, SCOPE_TYPE_);
create index ACT_IDX_TASK_SUB_SCOPE on ACT_RU_TASK(SUB_SCOPE_ID_, SCOPE_TYPE_);
create index ACT_IDX_TASK_SCOPE_DEF on ACT_RU_TASK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
insert into ACT_GE_PROPERTY values ('task.schema.version', '6.2.0.0', 1);
\ No newline at end of file
......@@ -5,6 +5,10 @@ create table ACT_HI_TASKINST (
TASK_DEF_KEY_ nvarchar(255),
PROC_INST_ID_ nvarchar(64),
EXECUTION_ID_ nvarchar(64),
SCOPE_ID_ nvarchar(255),
SUB_SCOPE_ID_ nvarchar(255),
SCOPE_TYPE_ nvarchar(255),
SCOPE_DEFINITION_ID_ nvarchar(255),
NAME_ nvarchar(255),
PARENT_TASK_ID_ nvarchar(64),
DESCRIPTION_ nvarchar(4000),
......@@ -22,4 +26,8 @@ create table ACT_HI_TASKINST (
TENANT_ID_ nvarchar(255) default '',
LAST_UPDATED_TIME_ datetime2,
primary key (ID_)
);
\ No newline at end of file
);
create index ACT_IDX_HI_TASK_SCOPE on ACT_HI_TASKINST(SCOPE_ID_, SCOPE_TYPE_);
create index ACT_IDX_HI_TASK_SUB_SCOPE on ACT_HI_TASKINST(SUB_SCOPE_ID_, SCOPE_TYPE_);
create index ACT_IDX_HI_TASK_SCOPE_DEF on ACT_HI_TASKINST(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
\ No newline at end of file
......@@ -4,6 +4,10 @@ create table ACT_RU_TASK (
EXECUTION_ID_ nvarchar(64),
PROC_INST_ID_ nvarchar(64),
PROC_DEF_ID_ nvarchar(64),
SCOPE_ID_ nvarchar(255),
SUB_SCOPE_ID_ nvarchar(255),
SCOPE_TYPE_ nvarchar(255),
SCOPE_DEFINITION_ID_ nvarchar(255),
NAME_ nvarchar(255),
PARENT_TASK_ID_ nvarchar(64),
DESCRIPTION_ nvarchar(4000),
......@@ -26,5 +30,8 @@ create table ACT_RU_TASK (
);
create index ACT_IDX_TASK_CREATE on ACT_RU_TASK(CREATE_TIME_);
create index ACT_IDX_TASK_SCOPE on ACT_RU_TASK(SCOPE_ID_, SCOPE_TYPE_);
create index ACT_IDX_TASK_SUB_SCOPE on ACT_RU_TASK(SUB_SCOPE_ID_, SCOPE_TYPE_);
create index ACT_IDX_TASK_SCOPE_DEF on ACT_RU_TASK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
insert into ACT_GE_PROPERTY values ('task.schema.version', '6.2.0.0', 1);
\ No newline at end of file
......@@ -5,6 +5,10 @@ create table ACT_HI_TASKINST (
TASK_DEF_KEY_ varchar(255),
PROC_INST_ID_ varchar(64),
EXECUTION_ID_ varchar(64),
SCOPE_ID_ varchar(255),
SUB_SCOPE_ID_ varchar(255),
SCOPE_TYPE_ varchar(255),
SCOPE_DEFINITION_ID_ varchar(255),
NAME_ varchar(255),
PARENT_TASK_ID_ varchar(64),
DESCRIPTION_ varchar(4000),
......@@ -22,4 +26,8 @@ create table ACT_HI_TASKINST (
TENANT_ID_ varchar(255) default '',
LAST_UPDATED_TIME_ datetime(3),
primary key (ID_)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
\ No newline at end of file
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
create index ACT_IDX_HI_TASK_SCOPE on ACT_HI_TASKINST(SCOPE_ID_, SCOPE_TYPE_);
create index ACT_IDX_HI_TASK_SUB_SCOPE on ACT_HI_TASKINST(SUB_SCOPE_ID_, SCOPE_TYPE_);
create index ACT_IDX_HI_TASK_SCOPE_DEF on ACT_HI_TASKINST(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
......@@ -4,6 +4,10 @@ create table ACT_RU_TASK (
EXECUTION_ID_ varchar(64),
PROC_INST_ID_ varchar(64),
PROC_DEF_ID_ varchar(64),
SCOPE_ID_ varchar(255),
SUB_SCOPE_ID_ varchar(255),
SCOPE_TYPE_ varchar(255),
SCOPE_DEFINITION_ID_ varchar(255),
NAME_ varchar(255),
PARENT_TASK_ID_ varchar(64),
DESCRIPTION_ varchar(4000),
......@@ -26,5 +30,8 @@ create table ACT_RU_TASK (
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
create index ACT_IDX_TASK_CREATE on ACT_RU_TASK(CREATE_TIME_);
create index ACT_IDX_TASK_SCOPE on ACT_RU_TASK(SCOPE_ID_, SCOPE_TYPE_);
create index ACT_IDX_TASK_SUB_SCOPE on ACT_RU_TASK(SUB_SCOPE_ID_, SCOPE_TYPE_);
create index ACT_IDX_TASK_SCOPE_DEF on ACT_RU_TASK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
insert into ACT_GE_PROPERTY values ('task.schema.version', '6.2.0.0', 1);
\ No newline at end of file
......@@ -5,6 +5,10 @@ create table ACT_HI_TASKINST (
TASK_DEF_KEY_ varchar(255),
PROC_INST_ID_ varchar(64),
EXECUTION_ID_ varchar(64),
SCOPE_ID_ varchar(255),
SUB_SCOPE_ID_ varchar(255),
SCOPE_TYPE_ varchar(255),
SCOPE_DEFINITION_ID_ varchar(255),
NAME_ varchar(255),
PARENT_TASK_ID_ varchar(64),
DESCRIPTION_ varchar(4000),
......@@ -22,4 +26,8 @@ create table ACT_HI_TASKINST (
TENANT_ID_ varchar(255) default '',
LAST_UPDATED_TIME_ datetime,
primary key (ID_)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
\ No newline at end of file
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
create index ACT_IDX_HI_TASK_SCOPE on ACT_HI_TASKINST(SCOPE_ID_, SCOPE_TYPE_);
create index ACT_IDX_HI_TASK_SUB_SCOPE on ACT_HI_TASKINST(SUB_SCOPE_ID_, SCOPE_TYPE_);
create index ACT_IDX_HI_TASK_SCOPE_DEF on ACT_HI_TASKINST(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
......@@ -4,6 +4,10 @@ create table ACT_RU_TASK (
EXECUTION_ID_ varchar(64),
PROC_INST_ID_ varchar(64),
PROC_DEF_ID_ varchar(64),
SCOPE_ID_ varchar(255),
SUB_SCOPE_ID_ varchar(255),
SCOPE_TYPE_ varchar(255),
SCOPE_DEFINITION_ID_ varchar(255),
NAME_ varchar(255),
PARENT_TASK_ID_ varchar(64),
DESCRIPTION_ varchar(4000),
......@@ -26,5 +30,8 @@ create table ACT_RU_TASK (
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
create index ACT_IDX_TASK_CREATE on ACT_RU_TASK(CREATE_TIME_);
create index ACT_IDX_TASK_SCOPE on ACT_RU_TASK(SCOPE_ID_, SCOPE_TYPE_);
create index ACT_IDX_TASK_SUB_SCOPE on ACT_RU_TASK(SUB_SCOPE_ID_, SCOPE_TYPE_);
create index ACT_IDX_TASK_SCOPE_DEF on ACT_RU_TASK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
insert into ACT_GE_PROPERTY values ('task.schema.version', '6.2.0.0', 1);
\ No newline at end of file
......@@ -5,6 +5,10 @@ create table ACT_HI_TASKINST (
TASK_DEF_KEY_ NVARCHAR2(255),
PROC_INST_ID_ NVARCHAR2(64),
EXECUTION_ID_ NVARCHAR2(64),
SCOPE_ID_ NVARCHAR2(255),
SUB_SCOPE_ID_ NVARCHAR2(255),
SCOPE_TYPE_ NVARCHAR2(255),
SCOPE_DEFINITION_ID_ NVARCHAR2(255),
PARENT_TASK_ID_ NVARCHAR2(64),
NAME_ NVARCHAR2(255),
DESCRIPTION_ NVARCHAR2(2000),
......@@ -22,4 +26,8 @@ create table ACT_HI_TASKINST (
TENANT_ID_ NVARCHAR2(255) default '',
LAST_UPDATED_TIME_ TIMESTAMP(6),
primary key (ID_)
);
\ No newline at end of file
);
create index ACT_IDX_HI_TASK_SCOPE on ACT_HI_TASKINST(SCOPE_ID_, SCOPE_TYPE_);
create index ACT_IDX_HI_TASK_SUB_SCOPE on ACT_HI_TASKINST(SUB_SCOPE_ID_, SCOPE_TYPE_);
create index ACT_IDX_HI_TASK_SCOPE_DEF on ACT_HI_TASKINST(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
\ No newline at end of file
......@@ -4,6 +4,10 @@ create table ACT_RU_TASK (
EXECUTION_ID_ NVARCHAR2(64),
PROC_INST_ID_ NVARCHAR2(64),
PROC_DEF_ID_ NVARCHAR2(64),
SCOPE_ID_ NVARCHAR2(255),
SUB_SCOPE_ID_ NVARCHAR2(255),
SCOPE_TYPE_ NVARCHAR2(255),
SCOPE_DEFINITION_ID_ NVARCHAR2(255),
NAME_ NVARCHAR2(255),
PARENT_TASK_ID_ NVARCHAR2(64),
DESCRIPTION_ NVARCHAR2(2000),
......@@ -26,5 +30,8 @@ create table ACT_RU_TASK (
);
create index ACT_IDX_TASK_CREATE on ACT_RU_TASK(CREATE_TIME_);
create index ACT_IDX_TASK_SCOPE on ACT_RU_TASK(SCOPE_ID_, SCOPE_TYPE_);
create index ACT_IDX_TASK_SUB_SCOPE on ACT_RU_TASK(SUB_SCOPE_ID_, SCOPE_TYPE_);
create index ACT_IDX_TASK_SCOPE_DEF on ACT_RU_TASK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
insert into ACT_GE_PROPERTY values ('task.schema.version', '6.2.0.0', 1);
\ No newline at end of file
......@@ -5,6 +5,10 @@ create table ACT_HI_TASKINST (
TASK_DEF_KEY_ varchar(255),
PROC_INST_ID_ varchar(64),
EXECUTION_ID_ varchar(64),
SCOPE_ID_ varchar(255),
SUB_SCOPE_ID_ varchar(255),
SCOPE_TYPE_ varchar(255),
SCOPE_DEFINITION_ID_ varchar(255),
NAME_ varchar(255),
PARENT_TASK_ID_ varchar(64),
DESCRIPTION_ varchar(4000),
......@@ -22,4 +26,8 @@ create table ACT_HI_TASKINST (
TENANT_ID_ varchar(255) default '',
LAST_UPDATED_TIME_ timestamp,
primary key (ID_)
);
\ No newline at end of file
);
create index ACT_IDX_HI_TASK_SCOPE on ACT_HI_TASKINST(SCOPE_ID_, SCOPE_TYPE_);
create index ACT_IDX_HI_TASK_SUB_SCOPE on ACT_HI_TASKINST(SUB_SCOPE_ID_, SCOPE_TYPE_);
create index ACT_IDX_HI_TASK_SCOPE_DEF on ACT_HI_TASKINST(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
\ No newline at end of file
......@@ -4,6 +4,10 @@ create table ACT_RU_TASK (
EXECUTION_ID_ varchar(64),
PROC_INST_ID_ varchar(64),
PROC_DEF_ID_ varchar(64),
SCOPE_ID_ varchar(255),
SUB_SCOPE_ID_ varchar(255),
SCOPE_TYPE_ varchar(255),
SCOPE_DEFINITION_ID_ varchar(255),
NAME_ varchar(255),
PARENT_TASK_ID_ varchar(64),
DESCRIPTION_ varchar(4000),
......@@ -26,5 +30,8 @@ create table ACT_RU_TASK (
);
create index ACT_IDX_TASK_CREATE on ACT_RU_TASK(CREATE_TIME_);
create index ACT_IDX_TASK_SCOPE on ACT_RU_TASK(SCOPE_ID_, SCOPE_TYPE_);
create index ACT_IDX_TASK_SUB_SCOPE on ACT_RU_TASK(SUB_SCOPE_ID_, SCOPE_TYPE_);
create index ACT_IDX_TASK_SCOPE_DEF on ACT_RU_TASK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
insert into ACT_GE_PROPERTY values ('task.schema.version', '6.2.0.0', 1);
\ No newline at end of file
drop index ACT_IDX_HI_TASK_SCOPE;
drop index ACT_IDX_HI_TASK_SUB_SCOPE;
drop index ACT_IDX_HI_TASK_SCOPE_DEF;
drop table ACT_HI_TASKINST;
\ No newline at end of file
drop index ACT_IDX_TASK_CREATE;
drop index ACT_IDX_TASK_SCOPE;
drop index ACT_IDX_TASK_SUB_SCOPE;
drop index ACT_IDX_TASK_SCOPE_DEF;
drop table ACT_RU_TASK;
\ No newline at end of file
drop table if exists ACT_RU_TASK cascade constraints;
drop index if exists ACT_IDX_TASK_CREATE;
\ No newline at end of file
drop index if exists ACT_IDX_TASK_CREATE;
drop index if exists ACT_IDX_HI_TASK_SCOPE;
drop index if exists ACT_IDX_HI_TASK_SUB_SCOPE;
drop index if exists ACT_IDX_HI_TASK_SCOPE_DEF;
\ No newline at end of file
drop table if exists ACT_HI_TASKINST cascade;
\ No newline at end of file
drop table if exists ACT_HI_TASKINST cascade;
drop index if exists ACT_IDX_HI_TASK_SCOPE;
drop index if exists ACT_IDX_HI_TASK_SUB_SCOPE;
drop index if exists ACT_IDX_HI_TASK_SCOPE_DEF;
\ No newline at end of file
drop table if exists ACT_RU_TASK cascade;
drop index if exists ACT_IDX_TASK_CREATE;
\ No newline at end of file
drop index if exists ACT_IDX_TASK_CREATE;
drop index if exists ACT_IDX_TASK_SCOPE;
drop index if exists ACT_IDX_TASK_SUB_SCOPE;
drop index if exists ACT_IDX_TASK_SCOPE_DEF;
\ No newline at end of file
if exists (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_HI_TASK_SCOPE') drop index ACT_HI_TASKINST.ACT_IDX_HI_TASK_SCOPE;
if exists (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_HI_TASK_SUB_SCOPE') drop index ACT_HI_TASKINST.ACT_IDX_HI_TASK_SUB_SCOPE;
if exists (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_HI_TASK_SCOPE_DEF') drop index ACT_HI_TASKINST.ACT_IDX_HI_TASK_SCOPE_DEF;
if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_HI_TASKINST') drop table ACT_HI_TASKINST;
\ No newline at end of file
if exists (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_TASK_CREATE') drop index ACT_RU_TASK.ACT_IDX_TASK_CREATE;
if exists (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_TASK_SCOPE') drop index ACT_RU_TASK.ACT_IDX_TASK_SCOPE;
if exists (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_TASK_SUB_SCOPE') drop index ACT_RU_TASK.ACT_IDX_TASK_SUB_SCOPE;
if exists (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_TASK_SCOPE_DEF') drop index ACT_RU_TASK.ACT_IDX_TASK_SCOPE_DEF;
if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RU_TASK') drop table ACT_RU_TASK;
\ No newline at end of file
drop index ACT_IDX_HI_TASK_SCOPE on ACT_RU_TASK;
drop index ACT_IDX_HI_TASK_SUB_SCOPE on ACT_RU_TASK;
drop index ACT_IDX_HI_TASK_SCOPE_DEF on ACT_RU_TASK;
drop table if exists ACT_HI_TASKINST;
\ No newline at end of file
drop index ACT_IDX_TASK_CREATE on ACT_RU_TASK;
drop index ACT_IDX_TASK_SCOPE on ACT_RU_TASK;
drop index ACT_IDX_TASK_SUB_SCOPE on ACT_RU_TASK;
drop index ACT_IDX_TASK_SCOPE_DEF on ACT_RU_TASK;
drop table if exists ACT_RU_TASK;
\ No newline at end of file
drop index ACT_IDX_HI_TASK_SCOPE;
drop index ACT_IDX_HI_TASK_SUB_SCOPE;
drop index ACT_IDX_HI_TASK_SCOPE_DEF;
drop table ACT_HI_TASKINST;
\ No newline at end of file
drop index ACT_IDX_TASK_CREATE;
drop index ACT_IDX_TASK_SCOPE;
drop index ACT_IDX_TASK_SUB_SCOPE;
drop index ACT_IDX_TASK_SCOPE_DEF;
drop table ACT_RU_TASK;
\ No newline at end of file
......@@ -27,6 +27,10 @@
PROC_DEF_ID_,
PROC_INST_ID_,
EXECUTION_ID_,
SCOPE_ID_,
SUB_SCOPE_ID_,
SCOPE_TYPE_,
SCOPE_DEFINITION_ID_,
NAME_,
PARENT_TASK_ID_,
DESCRIPTION_,
......@@ -50,6 +54,10 @@
#{processDefinitionId, jdbcType=VARCHAR},
#{processInstanceId, jdbcType=VARCHAR},
#{executionId, jdbcType=VARCHAR},
#{scopeId, jdbcType=VARCHAR},
#{subScopeId, jdbcType=VARCHAR},
#{scopeType, jdbcType=VARCHAR},
#{scopeDefinitionId, jdbcType=VARCHAR},
#{name ,jdbcType=VARCHAR},
#{parentTaskId ,jdbcType=VARCHAR},
#{description ,jdbcType=VARCHAR},
......@@ -77,6 +85,10 @@
PROC_DEF_ID_,
PROC_INST_ID_,
EXECUTION_ID_,
SCOPE_ID_,
SUB_SCOPE_ID_,
SCOPE_TYPE_,
SCOPE_DEFINITION_ID_,
NAME_,
PARENT_TASK_ID_,
DESCRIPTION_,
......@@ -101,6 +113,10 @@
#{historicTask.processDefinitionId, jdbcType=VARCHAR},
#{historicTask.processInstanceId, jdbcType=VARCHAR},
#{historicTask.executionId, jdbcType=VARCHAR},
#{historicTask.scopeId, jdbcType=VARCHAR},
#{historicTask.subScopeId, jdbcType=VARCHAR},
#{historicTask.scopeType, jdbcType=VARCHAR},
#{historicTask.scopeDefinitionId, jdbcType=VARCHAR},
#{historicTask.name ,jdbcType=VARCHAR},
#{historicTask.parentTaskId ,jdbcType=VARCHAR},
#{historicTask.description ,jdbcType=VARCHAR},
......@@ -130,6 +146,10 @@
PROC_DEF_ID_,
PROC_INST_ID_,
EXECUTION_ID_,
SCOPE_ID_,
SUB_SCOPE_ID_,
SCOPE_TYPE_,
SCOPE_DEFINITION_ID_,
NAME_,
PARENT_TASK_ID_,
DESCRIPTION_,
......@@ -153,6 +173,10 @@
#{historicTask.processDefinitionId, jdbcType=VARCHAR},
#{historicTask.processInstanceId, jdbcType=VARCHAR},
#{historicTask.executionId, jdbcType=VARCHAR},
#{historicTask.scopeId, jdbcType=VARCHAR},
#{historicTask.subScopeId, jdbcType=VARCHAR},
#{historicTask.scopeType, jdbcType=VARCHAR},
#{historicTask.scopeDefinitionId, jdbcType=VARCHAR},
#{historicTask.name ,jdbcType=VARCHAR},
#{historicTask.parentTaskId ,jdbcType=VARCHAR},
#{historicTask.description ,jdbcType=VARCHAR},
......@@ -186,6 +210,18 @@
<if test="originalPersistentState.executionId != executionId">
EXECUTION_ID_ = #{executionId, jdbcType=VARCHAR},
</if>
<if test="originalPersistentState.scopeId != scopeId">
SCOPE_ID_ = #{scopeId, jdbcType=VARCHAR}
</if>
<if test="originalPersistentState.subScopeId != subScopeId">
SUB_SCOPE_ID_ = #{subScopeId, jdbcType=VARCHAR}
</if>
<if test="originalPersistentState.scopeType != scopeType">
SCOPE_TYPE_ = #{scopeType, jdbcType=VARCHAR}
</if>
<if test="originalPersistentState.scopeDefinitionId != scopeDefinitionId">
SCOPE_DEFINITION_ID_ = #{scopeDefinitionId, jdbcType=VARCHAR}
</if>
<if test="originalPersistentState.name != name">
NAME_ = #{name, jdbcType=VARCHAR},
</if>
......@@ -257,6 +293,10 @@
<result property="processDefinitionId" column="PROC_DEF_ID_" jdbcType="VARCHAR" />
<result property="processInstanceId" column="PROC_INST_ID_" jdbcType="VARCHAR" />
<result property="executionId" column="EXECUTION_ID_" jdbcType="VARCHAR" />
<result property="scopeId" column="SCOPE_ID_" jdbcType="VARCHAR"/>
<result property="subScopeId" column="SUB_SCOPE_ID_" jdbcType="VARCHAR"/>
<result property="scopeType" column="SCOPE_TYPE_" jdbcType="VARCHAR"/>
<result property="scopeDefinitionId" column="SCOPE_DEFINITION_ID_" jdbcType="VARCHAR"/>
<result property="name" column="NAME_" jdbcType="VARCHAR" />
<result property="parentTaskId" column="PARENT_TASK_ID_" jdbcType="VARCHAR" />
<result property="description" column="DESCRIPTION_" jdbcType="VARCHAR" />
......@@ -282,6 +322,10 @@
<result property="processDefinitionId" column="PROC_DEF_ID_" jdbcType="VARCHAR" />
<result property="processInstanceId" column="PROC_INST_ID_" jdbcType="VARCHAR" />
<result property="executionId" column="EXECUTION_ID_" jdbcType="VARCHAR" />
<result property="scopeId" column="SCOPE_ID_" jdbcType="VARCHAR"/>
<result property="subScopeId" column="SUB_SCOPE_ID_" jdbcType="VARCHAR"/>
<result property="scopeType" column="SCOPE_TYPE_" jdbcType="VARCHAR"/>
<result property="scopeDefinitionId" column="SCOPE_DEFINITION_ID_" jdbcType="VARCHAR"/>
<result property="name" column="NAME_" jdbcType="VARCHAR" />
<result property="parentTaskId" column="PARENT_TASK_ID_" jdbcType="VARCHAR" />
<result property="description" column="DESCRIPTION_" jdbcType="VARCHAR" />
......@@ -578,6 +622,18 @@
<if test="executionId != null">
and RES.EXECUTION_ID_ = #{executionId}
</if>
<if test="scopeId != null">
and RES.SCOPE_ID_ = #{scopeId}
</if>
<if test="subScopeId != null">
and RES.SUB_SCOPE_ID_ = #{subScopeId}
</if>
<if test="scopeType != null">
and RES.SCOPE_TYPE_ = #{scopeType}
</if>
<if test="scopeDefinitionId != null">
and RES.SCOPE_DEFINITION_ID_ = #{scopeDefinitionId}
</if>
<if test="taskName != null">
and RES.NAME_ = #{taskName}
</if>
......@@ -880,6 +936,18 @@
<if test="orQueryObject.executionId != null">
or RES.EXECUTION_ID_ = #{orQueryObject.executionId}
</if>
<if test="orQueryObject.scopeId != null">
and RES.SCOPE_ID_ = #{orQueryObject.scopeId}
</if>
<if test="orQueryObject.subScopeId != null">
and RES.SUB_SCOPE_ID_ = #{orQueryObject.subScopeId}
</if>
<if test="orQueryObject.scopeType != null">
and RES.SCOPE_TYPE_ = #{orQueryObject.scopeType}
</if>
<if test="orQueryObject.scopeDefinitionId != null">
and RES.SCOPE_DEFINITION_ID_ = #{orQueryObject.scopeDefinitionId}
</if>
<if test="orQueryObject.taskName != null">
or RES.NAME_ = #{orQueryObject.taskName}
</if>
......
......@@ -22,8 +22,10 @@
<!-- TASK INSERT -->
<insert id="insertTask" parameterType="org.flowable.task.service.impl.persistence.entity.TaskEntityImpl">
insert into ${prefix}ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_,
ASSIGNEE_, DELEGATION_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_KEY_, DUE_DATE_, CATEGORY_, SUSPENSION_STATE_, TENANT_ID_, FORM_KEY_, CLAIM_TIME_, IS_COUNT_ENABLED_, VAR_COUNT_, ID_LINK_COUNT_)
insert into ${prefix}ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, ASSIGNEE_, DELEGATION_,
EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, SCOPE_ID_, SUB_SCOPE_ID_, SCOPE_TYPE_, SCOPE_DEFINITION_ID_,
TASK_DEF_KEY_, DUE_DATE_, CATEGORY_, SUSPENSION_STATE_, TENANT_ID_, FORM_KEY_, CLAIM_TIME_,
IS_COUNT_ENABLED_, VAR_COUNT_, ID_LINK_COUNT_)
values (#{id, jdbcType=VARCHAR},
1,
#{name, jdbcType=VARCHAR},
......@@ -37,6 +39,10 @@
#{executionId, jdbcType=VARCHAR},
#{processInstanceId, jdbcType=VARCHAR},
#{processDefinitionId, jdbcType=VARCHAR},
#{scopeId, jdbcType=VARCHAR},
#{subScopeId, jdbcType=VARCHAR},
#{scopeType, jdbcType=VARCHAR},
#{scopeDefinitionId, jdbcType=VARCHAR},
#{taskDefinitionKey, jdbcType=VARCHAR},
#{dueDate, jdbcType=TIMESTAMP},
#{category, jdbcType=VARCHAR},
......@@ -51,8 +57,9 @@
</insert>
<insert id="bulkInsertTask" parameterType="java.util.List">
INSERT INTO ${prefix}ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_,
ASSIGNEE_, DELEGATION_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_KEY_, DUE_DATE_, CATEGORY_, SUSPENSION_STATE_, TENANT_ID_, FORM_KEY_, CLAIM_TIME_, IS_COUNT_ENABLED_, VAR_COUNT_, ID_LINK_COUNT_)
INSERT INTO ${prefix}ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, ASSIGNEE_, DELEGATION_,
EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, SCOPE_ID_, SUB_SCOPE_ID_, SCOPE_TYPE_, SCOPE_DEFINITION_ID_,
TASK_DEF_KEY_, DUE_DATE_, CATEGORY_, SUSPENSION_STATE_, TENANT_ID_, FORM_KEY_, CLAIM_TIME_, IS_COUNT_ENABLED_, VAR_COUNT_, ID_LINK_COUNT_)
VALUES
<foreach collection="list" item="task" index="index" separator=",">
(#{task.id, jdbcType=VARCHAR},
......@@ -68,6 +75,10 @@
#{task.executionId, jdbcType=VARCHAR},
#{task.processInstanceId, jdbcType=VARCHAR},
#{task.processDefinitionId, jdbcType=VARCHAR},
#{task.scopeId, jdbcType=VARCHAR},
#{task.subScopeId, jdbcType=VARCHAR},
#{task.scopeType, jdbcType=VARCHAR},
#{task.scopeDefinitionId, jdbcType=VARCHAR},
#{task.taskDefinitionKey, jdbcType=VARCHAR},
#{task.dueDate, jdbcType=TIMESTAMP},
#{task.category, jdbcType=VARCHAR},
......@@ -84,9 +95,9 @@
<insert id="bulkInsertTask" databaseId="oracle" parameterType="java.util.List">
INSERT ALL
<foreach collection="list" item="task" index="index">
INTO ${prefix}ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_,
ASSIGNEE_, DELEGATION_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_KEY_, DUE_DATE_, CATEGORY_,
SUSPENSION_STATE_, TENANT_ID_, FORM_KEY_, CLAIM_TIME_, IS_COUNT_ENABLED_, VAR_COUNT_, ID_LINK_COUNT_) VALUES
INTO ${prefix}ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, ASSIGNEE_, DELEGATION_,
EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, SCOPE_ID_, SUB_SCOPE_ID_, SCOPE_TYPE_, SCOPE_DEFINITION_ID_, TASK_DEF_KEY_,
DUE_DATE_, CATEGORY_, SUSPENSION_STATE_, TENANT_ID_, FORM_KEY_, CLAIM_TIME_, IS_COUNT_ENABLED_, VAR_COUNT_, ID_LINK_COUNT_) VALUES
(#{task.id, jdbcType=VARCHAR},
1,
#{task.name, jdbcType=VARCHAR},
......@@ -100,6 +111,10 @@
#{task.executionId, jdbcType=VARCHAR},
#{task.processInstanceId, jdbcType=VARCHAR},
#{task.processDefinitionId, jdbcType=VARCHAR},
#{task.scopeId, jdbcType=VARCHAR},
#{task.subScopeId, jdbcType=VARCHAR},
#{task.scopeType, jdbcType=VARCHAR},
#{task.scopeDefinitionId, jdbcType=VARCHAR},
#{task.taskDefinitionKey, jdbcType=VARCHAR},
#{task.dueDate, jdbcType=TIMESTAMP},
#{task.category, jdbcType=VARCHAR},
......@@ -147,6 +162,18 @@
<if test="originalPersistentState.processDefinitionId != processDefinitionId">
PROC_DEF_ID_ = #{processDefinitionId, jdbcType=VARCHAR},
</if>
<if test="originalPersistentState.scopeId != scopeId">
SCOPE_ID_ = #{scopeId, jdbcType=VARCHAR}
</if>
<if test="originalPersistentState.subScopeId != subScopeId">
SUB_SCOPE_ID_ = #{subScopeId, jdbcType=VARCHAR}
</if>
<if test="originalPersistentState.scopeType != scopeType">
SCOPE_TYPE_ = #{scopeType, jdbcType=VARCHAR}
</if>
<if test="originalPersistentState.scopeDefinitionId != scopeDefinitionId">
SCOPE_DEFINITION_ID_ = #{scopeDefinitionId, jdbcType=VARCHAR}
</if>
<if test="originalPersistentState.description != description">
DESCRIPTION_ = #{description, jdbcType=VARCHAR},
</if>
......@@ -246,6 +273,10 @@
<result property="executionId" column="EXECUTION_ID_" jdbcType="VARCHAR" />
<result property="processInstanceId" column="PROC_INST_ID_" jdbcType="VARCHAR" />
<result property="processDefinitionId" column="PROC_DEF_ID_" jdbcType="VARCHAR"/>
<result property="scopeId" column="SCOPE_ID_" jdbcType="VARCHAR"/>
<result property="subScopeId" column="SUB_SCOPE_ID_" jdbcType="VARCHAR"/>
<result property="scopeType" column="SCOPE_TYPE_" jdbcType="VARCHAR"/>
<result property="scopeDefinitionId" column="SCOPE_DEFINITION_ID_" jdbcType="VARCHAR"/>
<result property="taskDefinitionKey" column="TASK_DEF_KEY_" jdbcType="VARCHAR"/>
<result property="dueDate" column="DUE_DATE_" jdbcType="TIMESTAMP"/>
<result property="category" column="CATEGORY_" jdbcType="VARCHAR" />
......@@ -272,6 +303,10 @@
<result property="executionId" column="EXECUTION_ID_" jdbcType="VARCHAR" />
<result property="processInstanceId" column="PROC_INST_ID_" jdbcType="VARCHAR" />
<result property="processDefinitionId" column="PROC_DEF_ID_" jdbcType="VARCHAR"/>
<result property="scopeId" column="SCOPE_ID_" jdbcType="VARCHAR"/>
<result property="subScopeId" column="SUB_SCOPE_ID_" jdbcType="VARCHAR"/>
<result property="scopeType" column="SCOPE_TYPE_" jdbcType="VARCHAR"/>
<result property="scopeDefinitionId" column="SCOPE_DEFINITION_ID_" jdbcType="VARCHAR"/>
<result property="taskDefinitionKey" column="TASK_DEF_KEY_" jdbcType="VARCHAR"/>
<result property="dueDate" column="DUE_DATE_" jdbcType="TIMESTAMP"/>
<result property="category" column="CATEGORY_" jdbcType="VARCHAR" />
......@@ -601,6 +636,18 @@
<if test="executionId != null">
and RES.EXECUTION_ID_ = #{executionId}
</if>
<if test="scopeId != null">
and RES.SCOPE_ID_ = #{scopeId}
</if>
<if test="subScopeId != null">
and RES.SUB_SCOPE_ID_ = #{subScopeId}
</if>
<if test="scopeType != null">
and RES.SCOPE_TYPE_ = #{scopeType}
</if>
<if test="scopeDefinitionId != null">
and RES.SCOPE_DEFINITION_ID_ = #{scopeDefinitionId}
</if>
<if test="createTime != null">
and RES.CREATE_TIME_ = #{createTime}
</if>
......@@ -925,6 +972,18 @@
<if test="orQueryObject.executionId != null">
or RES.EXECUTION_ID_ = #{orQueryObject.executionId}
</if>
<if test="orQueryObject.scopeId != null">
and RES.SCOPE_ID_ = #{orQueryObject.scopeId}
</if>
<if test="orQueryObject.subScopeId != null">
and RES.SUB_SCOPE_ID_ = #{orQueryObject.subScopeId}
</if>
<if test="orQueryObject.scopeType != null">
and RES.SCOPE_TYPE_ = #{orQueryObject.scopeType}
</if>
<if test="orQueryObject.scopeDefinitionId != null">
and RES.SCOPE_DEFINITION_ID_ = #{orQueryObject.scopeDefinitionId}
</if>
<if test="orQueryObject.createTime != null">
or RES.CREATE_TIME_ = #{orQueryObject.createTime}
</if>
......
\ No newline at end of file
alter table ACT_HI_TASKINST add column SCOPE_ID_ varchar(255);
alter table ACT_HI_TASKINST add column SUB_SCOPE_ID_ varchar(255);
alter table ACT_HI_TASKINST add column SCOPE_TYPE_ varchar(255);
alter table ACT_HI_TASKINST add column SCOPE_DEFINITION_ID_ varchar(255);
create index ACT_IDX_HI_TASK_SCOPE on ACT_HI_TASKINST(SCOPE_ID_, SCOPE_TYPE_);
create index ACT_IDX_HI_TASK_SUB_SCOPE on ACT_HI_TASKINST(SUB_SCOPE_ID_, SCOPE_TYPE_);
create index ACT_IDX_HI_TASK_SCOPE_DEF on ACT_HI_TASKINST(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
\ No newline at end of file
alter table ACT_RU_TASK add column SCOPE_ID_ varchar(255);
alter table ACT_RU_TASK add column SUB_SCOPE_ID_ varchar(255);
alter table ACT_RU_TASK add column SCOPE_TYPE_ varchar(255);
alter table ACT_RU_TASK add column SCOPE_DEFINITION_ID_ varchar(255);
create index ACT_IDX_TASK_SCOPE on ACT_RU_TASK(SCOPE_ID_, SCOPE_TYPE_);
create index ACT_IDX_TASK_SUB_SCOPE on ACT_RU_TASK(SUB_SCOPE_ID_, SCOPE_TYPE_);
create index ACT_IDX_TASK_SCOPE_DEF on ACT_RU_TASK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
insert into ACT_GE_PROPERTY values ('task.schema.version', '6.2.0.0', 1);
\ No newline at end of file
\ No newline at end of file
alter table ACT_HI_TASKINST add column SCOPE_ID_ varchar(255);
alter table ACT_HI_TASKINST add column SUB_SCOPE_ID_ varchar(255);
alter table ACT_HI_TASKINST add column SCOPE_TYPE_ varchar(255);
alter table ACT_HI_TASKINST add column SCOPE_DEFINITION_ID_ varchar(255);
create index ACT_IDX_HI_TASK_SCOPE on ACT_HI_TASKINST(SCOPE_ID_, SCOPE_TYPE_);
create index ACT_IDX_HI_TASK_SUB_SCOPE on ACT_HI_TASKINST(SUB_SCOPE_ID_, SCOPE_TYPE_);
create index ACT_IDX_HI_TASK_SCOPE_DEF on ACT_HI_TASKINST(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
\ No newline at end of file
alter table ACT_RU_TASK add column SCOPE_ID_ varchar(255);
alter table ACT_RU_TASK add column SUB_SCOPE_ID_ varchar(255);
alter table ACT_RU_TASK add column SCOPE_TYPE_ varchar(255);
alter table ACT_RU_TASK add column SCOPE_DEFINITION_ID_ varchar(255);
create index ACT_IDX_TASK_SCOPE on ACT_RU_TASK(SCOPE_ID_, SCOPE_TYPE_);
create index ACT_IDX_TASK_SUB_SCOPE on ACT_RU_TASK(SUB_SCOPE_ID_, SCOPE_TYPE_);
create index ACT_IDX_TASK_SCOPE_DEF on ACT_RU_TASK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
insert into ACT_GE_PROPERTY values ('task.schema.version', '6.2.0.0', 1);
\ No newline at end of file
\ No newline at end of file
alter table ACT_HI_TASKINST add column SCOPE_ID_ varchar(255);
alter table ACT_HI_TASKINST add column SUB_SCOPE_ID_ varchar(255);
alter table ACT_HI_TASKINST add column SCOPE_TYPE_ varchar(255);
alter table ACT_HI_TASKINST add column SCOPE_DEFINITION_ID_ varchar(255);
create index ACT_IDX_HI_TASK_SCOPE on ACT_HI_TASKINST(SCOPE_ID_, SCOPE_TYPE_);
create index ACT_IDX_HI_TASK_SUB_SCOPE on ACT_HI_TASKINST(SUB_SCOPE_ID_, SCOPE_TYPE_);
create index ACT_IDX_HI_TASK_SCOPE_DEF on ACT_HI_TASKINST(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
\ No newline at end of file
alter table ACT_RU_TASK add column SCOPE_ID_ varchar(255);
alter table ACT_RU_TASK add column SUB_SCOPE_ID_ varchar(255);
alter table ACT_RU_TASK add column SCOPE_TYPE_ varchar(255);
alter table ACT_RU_TASK add column SCOPE_DEFINITION_ID_ varchar(255);
create index ACT_IDX_TASK_SCOPE on ACT_RU_TASK(SCOPE_ID_, SCOPE_TYPE_);
create index ACT_IDX_TASK_SUB_SCOPE on ACT_RU_TASK(SUB_SCOPE_ID_, SCOPE_TYPE_);
create index ACT_IDX_TASK_SCOPE_DEF on ACT_RU_TASK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
insert into ACT_GE_PROPERTY values ('task.schema.version', '6.2.0.0', 1);
\ No newline at end of file
\ No newline at end of file
alter table ACT_HI_TASKINST add column SCOPE_ID_ nvarchar(255);
alter table ACT_HI_TASKINST add column SUB_SCOPE_ID_ nvarchar(255);
alter table ACT_HI_TASKINST add column SCOPE_TYPE_ nvarchar(255);
alter table ACT_HI_TASKINST add column SCOPE_DEFINITION_ID_ nvarchar(255);
create index ACT_IDX_HI_TASK_SCOPE on ACT_HI_TASKINST(SCOPE_ID_, SCOPE_TYPE_);
create index ACT_IDX_HI_TASK_SUB_SCOPE on ACT_HI_TASKINST(SUB_SCOPE_ID_, SCOPE_TYPE_);
create index ACT_IDX_HI_TASK_SCOPE_DEF on ACT_HI_TASKINST(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
\ No newline at end of file
alter table ACT_RU_TASK add column SCOPE_ID_ nvarchar(255);
alter table ACT_RU_TASK add column SUB_SCOPE_ID_ nvarchar(255);
alter table ACT_RU_TASK add column SCOPE_TYPE_ nvarchar(255);
alter table ACT_RU_TASK add column SCOPE_DEFINITION_ID_ nvarchar(255);
create index ACT_IDX_TASK_SCOPE on ACT_RU_TASK(SCOPE_ID_, SCOPE_TYPE_);
create index ACT_IDX_TASK_SUB_SCOPE on ACT_RU_TASK(SUB_SCOPE_ID_, SCOPE_TYPE_);
create index ACT_IDX_TASK_SCOPE_DEF on ACT_RU_TASK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
insert into ACT_GE_PROPERTY values ('task.schema.version', '6.2.0.0', 1);
\ No newline at end of file
\ No newline at end of file
alter table ACT_HI_TASKINST add column SCOPE_ID_ varchar(255);
alter table ACT_HI_TASKINST add column SUB_SCOPE_ID_ varchar(255);
alter table ACT_HI_TASKINST add column SCOPE_TYPE_ varchar(255);
alter table ACT_HI_TASKINST add column SCOPE_DEFINITION_ID_ varchar(255);
create index ACT_IDX_HI_TASK_SCOPE on ACT_HI_TASKINST(SCOPE_ID_, SCOPE_TYPE_);
create index ACT_IDX_HI_TASK_SUB_SCOPE on ACT_HI_TASKINST(SUB_SCOPE_ID_, SCOPE_TYPE_);
create index ACT_IDX_HI_TASK_SCOPE_DEF on ACT_HI_TASKINST(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
\ No newline at end of file
alter table ACT_RU_TASK add column SCOPE_ID_ varchar(255);
alter table ACT_RU_TASK add column SUB_SCOPE_ID_ varchar(255);
alter table ACT_RU_TASK add column SCOPE_TYPE_ varchar(255);
alter table ACT_RU_TASK add column SCOPE_DEFINITION_ID_ varchar(255);
create index ACT_IDX_TASK_SCOPE on ACT_RU_TASK(SCOPE_ID_, SCOPE_TYPE_);
create index ACT_IDX_TASK_SUB_SCOPE on ACT_RU_TASK(SUB_SCOPE_ID_, SCOPE_TYPE_);
create index ACT_IDX_TASK_SCOPE_DEF on ACT_RU_TASK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
insert into ACT_GE_PROPERTY values ('task.schema.version', '6.2.0.0', 1);
\ No newline at end of file
\ No newline at end of file
alter table ACT_HI_TASKINST add column SCOPE_ID_ varchar(255);
alter table ACT_HI_TASKINST add column SUB_SCOPE_ID_ varchar(255);
alter table ACT_HI_TASKINST add column SCOPE_TYPE_ varchar(255);
alter table ACT_HI_TASKINST add column SCOPE_DEFINITION_ID_ varchar(255);
create index ACT_IDX_HI_TASK_SCOPE on ACT_HI_TASKINST(SCOPE_ID_, SCOPE_TYPE_);
create index ACT_IDX_HI_TASK_SUB_SCOPE on ACT_HI_TASKINST(SUB_SCOPE_ID_, SCOPE_TYPE_);
create index ACT_IDX_HI_TASK_SCOPE_DEF on ACT_HI_TASKINST(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
\ No newline at end of file
alter table ACT_RU_TASK add column SCOPE_ID_ varchar(255);
alter table ACT_RU_TASK add column SUB_SCOPE_ID_ varchar(255);
alter table ACT_RU_TASK add column SCOPE_TYPE_ varchar(255);
alter table ACT_RU_TASK add column SCOPE_DEFINITION_ID_ varchar(255);
create index ACT_IDX_TASK_SCOPE on ACT_RU_TASK(SCOPE_ID_, SCOPE_TYPE_);
create index ACT_IDX_TASK_SUB_SCOPE on ACT_RU_TASK(SUB_SCOPE_ID_, SCOPE_TYPE_);
create index ACT_IDX_TASK_SCOPE_DEF on ACT_RU_TASK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
insert into ACT_GE_PROPERTY values ('task.schema.version', '6.2.0.0', 1);
\ No newline at end of file
\ No newline at end of file
alter table ACT_HI_TASKINST add SCOPE_ID_ NVARCHAR2(255);
alter table ACT_HI_TASKINST add SUB_SCOPE_ID_ NVARCHAR2(255);
alter table ACT_HI_TASKINST add SCOPE_TYPE_ NVARCHAR2(255);
alter table ACT_HI_TASKINST add SCOPE_DEFINITION_ID_ NVARCHAR2(255);
create index ACT_IDX_HI_TASK_SCOPE on ACT_HI_TASKINST(SCOPE_ID_, SCOPE_TYPE_);
create index ACT_IDX_HI_TASK_SUB_SCOPE on ACT_HI_TASKINST(SUB_SCOPE_ID_, SCOPE_TYPE_);
create index ACT_IDX_HI_TASK_SCOPE_DEF on ACT_HI_TASKINST(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
\ No newline at end of file
alter table ACT_RU_TASK add SCOPE_ID_ NVARCHAR2(255);
alter table ACT_RU_TASK add SUB_SCOPE_ID_ NVARCHAR2(255);
alter table ACT_RU_TASK add SCOPE_TYPE_ NVARCHAR2(255);
alter table ACT_RU_TASK add SCOPE_DEFINITION_ID_ NVARCHAR2(255);
create index ACT_IDX_TASK_SCOPE on ACT_RU_TASK(SCOPE_ID_, SCOPE_TYPE_);
create index ACT_IDX_TASK_SUB_SCOPE on ACT_RU_TASK(SUB_SCOPE_ID_, SCOPE_TYPE_);
create index ACT_IDX_TASK_SCOPE_DEF on ACT_RU_TASK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
insert into ACT_GE_PROPERTY values ('task.schema.version', '6.2.0.0', 1);
\ No newline at end of file
\ No newline at end of file
alter table ACT_HI_TASKINST add column SCOPE_ID_ varchar(255);
alter table ACT_HI_TASKINST add column SUB_SCOPE_ID_ varchar(255);
alter table ACT_HI_TASKINST add column SCOPE_TYPE_ varchar(255);
alter table ACT_HI_TASKINST add column SCOPE_DEFINITION_ID_ varchar(255);
create index ACT_IDX_HI_TASK_SCOPE on ACT_HI_TASKINST(SCOPE_ID_, SCOPE_TYPE_);
create index ACT_IDX_HI_TASK_SUB_SCOPE on ACT_HI_TASKINST(SUB_SCOPE_ID_, SCOPE_TYPE_);
create index ACT_IDX_HI_TASK_SCOPE_DEF on ACT_HI_TASKINST(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
\ No newline at end of file
alter table ACT_RU_TASK add column SCOPE_ID_ varchar(255);
alter table ACT_RU_TASK add column SUB_SCOPE_ID_ varchar(255);
alter table ACT_RU_TASK add column SCOPE_TYPE_ varchar(255);
alter table ACT_RU_TASK add column SCOPE_DEFINITION_ID_ varchar(255);
create index ACT_IDX_TASK_SCOPE on ACT_RU_TASK(SCOPE_ID_, SCOPE_TYPE_);
create index ACT_IDX_TASK_SUB_SCOPE on ACT_RU_TASK(SUB_SCOPE_ID_, SCOPE_TYPE_);
create index ACT_IDX_TASK_SCOPE_DEF on ACT_RU_TASK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
insert into ACT_GE_PROPERTY values ('task.schema.version', '6.2.0.0', 1);
\ No newline at end of file
......@@ -50,7 +50,7 @@ public class ManagementServiceTest extends PluggableFlowableTestCase {
TableMetaData tableMetaData = managementService.getTableMetaData(tablePrefix + "ACT_RU_TASK");
assertEquals(tableMetaData.getColumnNames().size(), tableMetaData.getColumnTypes().size());
assertEquals(23, tableMetaData.getColumnNames().size());
assertEquals(27, tableMetaData.getColumnNames().size());
int assigneeIndex = tableMetaData.getColumnNames().indexOf("ASSIGNEE_");
int createTimeIndex = tableMetaData.getColumnNames().indexOf("CREATE_TIME_");
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册