|
@@ -3,10 +3,12 @@
|
|
*/
|
|
*/
|
|
package com.jeeplus.modules.act.entity;
|
|
package com.jeeplus.modules.act.entity;
|
|
|
|
|
|
-import java.util.Date;
|
|
|
|
-import java.util.List;
|
|
|
|
-import java.util.Map;
|
|
|
|
-
|
|
|
|
|
|
+import com.fasterxml.jackson.annotation.JsonFormat;
|
|
|
|
+import com.fasterxml.jackson.annotation.JsonIgnore;
|
|
|
|
+import com.jeeplus.common.utils.StringUtils;
|
|
|
|
+import com.jeeplus.common.utils.TimeUtils;
|
|
|
|
+import com.jeeplus.core.persistence.BaseEntity;
|
|
|
|
+import com.jeeplus.modules.act.utils.Variable;
|
|
import org.activiti.engine.history.HistoricActivityInstance;
|
|
import org.activiti.engine.history.HistoricActivityInstance;
|
|
import org.activiti.engine.history.HistoricProcessInstance;
|
|
import org.activiti.engine.history.HistoricProcessInstance;
|
|
import org.activiti.engine.history.HistoricTaskInstance;
|
|
import org.activiti.engine.history.HistoricTaskInstance;
|
|
@@ -14,12 +16,9 @@ import org.activiti.engine.repository.ProcessDefinition;
|
|
import org.activiti.engine.runtime.ProcessInstance;
|
|
import org.activiti.engine.runtime.ProcessInstance;
|
|
import org.activiti.engine.task.Task;
|
|
import org.activiti.engine.task.Task;
|
|
|
|
|
|
-import com.fasterxml.jackson.annotation.JsonFormat;
|
|
|
|
-import com.fasterxml.jackson.annotation.JsonIgnore;
|
|
|
|
-import com.jeeplus.common.utils.StringUtils;
|
|
|
|
-import com.jeeplus.common.utils.TimeUtils;
|
|
|
|
-import com.jeeplus.core.persistence.BaseEntity;
|
|
|
|
-import com.jeeplus.modules.act.utils.Variable;
|
|
|
|
|
|
+import java.util.Date;
|
|
|
|
+import java.util.List;
|
|
|
|
+import java.util.Map;
|
|
|
|
|
|
/**
|
|
/**
|
|
* 工作流Entity
|
|
* 工作流Entity
|
|
@@ -27,7 +26,7 @@ import com.jeeplus.modules.act.utils.Variable;
|
|
* @version 2016-11-03
|
|
* @version 2016-11-03
|
|
*/
|
|
*/
|
|
public class Act extends BaseEntity<Act> {
|
|
public class Act extends BaseEntity<Act> {
|
|
-
|
|
|
|
|
|
+
|
|
private static final long serialVersionUID = 1L;
|
|
private static final long serialVersionUID = 1L;
|
|
|
|
|
|
private String taskId; // 任务编号
|
|
private String taskId; // 任务编号
|
|
@@ -40,7 +39,7 @@ public class Act extends BaseEntity<Act> {
|
|
|
|
|
|
private String businessTable; // 业务绑定Table
|
|
private String businessTable; // 业务绑定Table
|
|
private String businessId; // 业务绑定ID
|
|
private String businessId; // 业务绑定ID
|
|
-
|
|
|
|
|
|
+
|
|
private String title; // 任务标题
|
|
private String title; // 任务标题
|
|
|
|
|
|
private String status; // 任务状态(/start/todo/claim/finish)
|
|
private String status; // 任务状态(/start/todo/claim/finish)
|
|
@@ -50,7 +49,40 @@ public class Act extends BaseEntity<Act> {
|
|
// private String procExecUrl; // 流程执行(办理)RUL
|
|
// private String procExecUrl; // 流程执行(办理)RUL
|
|
private String comment; // 任务意见
|
|
private String comment; // 任务意见
|
|
private String flag; // 意见状态
|
|
private String flag; // 意见状态
|
|
-
|
|
|
|
|
|
+
|
|
|
|
+ //储备项目名称
|
|
|
|
+ private String reserveProjectName;
|
|
|
|
+
|
|
|
|
+ //项目定义号
|
|
|
|
+ private String projectId;
|
|
|
|
+
|
|
|
|
+ //项目名称
|
|
|
|
+ private String projectName;
|
|
|
|
+
|
|
|
|
+ public String getReserveProjectName() {
|
|
|
|
+ return reserveProjectName;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public void setReserveProjectName(String reserveProjectName) {
|
|
|
|
+ this.reserveProjectName = reserveProjectName;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public String getProjectId() {
|
|
|
|
+ return projectId;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public void setProjectId(String projectId) {
|
|
|
|
+ this.projectId = projectId;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public String getProjectName() {
|
|
|
|
+ return projectName;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public void setProjectName(String projectName) {
|
|
|
|
+ this.projectName = projectName;
|
|
|
|
+ }
|
|
|
|
+
|
|
private Task task; // 任务对象
|
|
private Task task; // 任务对象
|
|
private ProcessDefinition procDef; // 流程定义对象
|
|
private ProcessDefinition procDef; // 流程定义对象
|
|
private ProcessInstance procIns; // 流程实例对象
|
|
private ProcessInstance procIns; // 流程实例对象
|
|
@@ -63,7 +95,7 @@ public class Act extends BaseEntity<Act> {
|
|
|
|
|
|
private Variable vars; // 流程变量
|
|
private Variable vars; // 流程变量
|
|
// private Variable taskVars; // 流程任务变量
|
|
// private Variable taskVars; // 流程任务变量
|
|
-
|
|
|
|
|
|
+
|
|
private Date beginDate; // 开始查询日期
|
|
private Date beginDate; // 开始查询日期
|
|
private Date endDate; // 结束查询日期
|
|
private Date endDate; // 结束查询日期
|
|
|
|
|
|
@@ -72,7 +104,8 @@ public class Act extends BaseEntity<Act> {
|
|
public Act() {
|
|
public Act() {
|
|
super();
|
|
super();
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
|
|
+
|
|
|
|
|
|
public String getTaskId() {
|
|
public String getTaskId() {
|
|
if (taskId == null && task != null){
|
|
if (taskId == null && task != null){
|
|
@@ -106,7 +139,7 @@ public class Act extends BaseEntity<Act> {
|
|
public void setTaskDefKey(String taskDefKey) {
|
|
public void setTaskDefKey(String taskDefKey) {
|
|
this.taskDefKey = taskDefKey;
|
|
this.taskDefKey = taskDefKey;
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
|
public Date getTaskCreateDate() {
|
|
public Date getTaskCreateDate() {
|
|
if (task != null){
|
|
if (task != null){
|
|
@@ -114,7 +147,7 @@ public class Act extends BaseEntity<Act> {
|
|
}
|
|
}
|
|
return null;
|
|
return null;
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
|
public Date getTaskEndDate() {
|
|
public Date getTaskEndDate() {
|
|
if (histTask != null){
|
|
if (histTask != null){
|
|
@@ -122,7 +155,7 @@ public class Act extends BaseEntity<Act> {
|
|
}
|
|
}
|
|
return null;
|
|
return null;
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
@JsonIgnore
|
|
@JsonIgnore
|
|
public Task getTask() {
|
|
public Task getTask() {
|
|
return task;
|
|
return task;
|
|
@@ -140,7 +173,7 @@ public class Act extends BaseEntity<Act> {
|
|
public void setProcDef(ProcessDefinition procDef) {
|
|
public void setProcDef(ProcessDefinition procDef) {
|
|
this.procDef = procDef;
|
|
this.procDef = procDef;
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
public String getProcDefName() {
|
|
public String getProcDefName() {
|
|
return procDef.getName();
|
|
return procDef.getName();
|
|
}
|
|
}
|
|
@@ -160,7 +193,7 @@ public class Act extends BaseEntity<Act> {
|
|
setBusinessId(procIns.getBusinessKey());
|
|
setBusinessId(procIns.getBusinessKey());
|
|
}
|
|
}
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
public void setFinishedProcIns(HistoricProcessInstance procIns) {
|
|
public void setFinishedProcIns(HistoricProcessInstance procIns) {
|
|
//this.procIns = procIns;
|
|
//this.procIns = procIns;
|
|
if (procIns != null && procIns.getBusinessKey() != null&& procIns.getBusinessKey().contains(":")){
|
|
if (procIns != null && procIns.getBusinessKey() != null&& procIns.getBusinessKey().contains(":")){
|
|
@@ -187,7 +220,7 @@ public class Act extends BaseEntity<Act> {
|
|
public void setTitle(String title) {
|
|
public void setTitle(String title) {
|
|
this.title = title;
|
|
this.title = title;
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
public String getStatus() {
|
|
public String getStatus() {
|
|
return status;
|
|
return status;
|
|
}
|
|
}
|
|
@@ -320,7 +353,7 @@ public class Act extends BaseEntity<Act> {
|
|
public void setVars(Variable vars) {
|
|
public void setVars(Variable vars) {
|
|
this.vars = vars;
|
|
this.vars = vars;
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
/**
|
|
/**
|
|
* 通过Map设置流程变量值
|
|
* 通过Map设置流程变量值
|
|
* @param map
|
|
* @param map
|
|
@@ -359,7 +392,7 @@ public class Act extends BaseEntity<Act> {
|
|
public void setProcDefKey(String procDefKey) {
|
|
public void setProcDefKey(String procDefKey) {
|
|
this.procDefKey = procDefKey;
|
|
this.procDefKey = procDefKey;
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
/**
|
|
/**
|
|
* 获取过去的任务历时
|
|
* 获取过去的任务历时
|
|
* @return
|
|
* @return
|
|
@@ -370,7 +403,7 @@ public class Act extends BaseEntity<Act> {
|
|
}
|
|
}
|
|
return "";
|
|
return "";
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
/**
|
|
/**
|
|
* 是否是一个待办任务
|
|
* 是否是一个待办任务
|
|
* @return
|
|
* @return
|
|
@@ -378,7 +411,7 @@ public class Act extends BaseEntity<Act> {
|
|
public boolean isTodoTask(){
|
|
public boolean isTodoTask(){
|
|
return "todo".equals(status) || "claim".equals(status);
|
|
return "todo".equals(status) || "claim".equals(status);
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
/**
|
|
/**
|
|
* 是否是已完成任务
|
|
* 是否是已完成任务
|
|
* @return
|
|
* @return
|
|
@@ -392,12 +425,12 @@ public class Act extends BaseEntity<Act> {
|
|
}
|
|
}
|
|
@Override
|
|
@Override
|
|
public void preInsert() {
|
|
public void preInsert() {
|
|
-
|
|
|
|
|
|
+
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public void preUpdate() {
|
|
public void preUpdate() {
|
|
-
|
|
|
|
|
|
+
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|