diff --git a/src/main/java/neatlogic/framework/process/dto/ActionVo.java b/src/main/java/neatlogic/framework/process/dto/ProcessTaskActionVo.java old mode 100755 new mode 100644 similarity index 54% rename from src/main/java/neatlogic/framework/process/dto/ActionVo.java rename to src/main/java/neatlogic/framework/process/dto/ProcessTaskActionVo.java index 24d3eba4cda89e8ca37d6fd8322061b0077842ea..32bfc7a87236f8ec46f37401b79bc9754181b2ee --- a/src/main/java/neatlogic/framework/process/dto/ActionVo.java +++ b/src/main/java/neatlogic/framework/process/dto/ProcessTaskActionVo.java @@ -1,16 +1,49 @@ package neatlogic.framework.process.dto; -public class ActionVo { +import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson.annotation.JSONField; +import neatlogic.framework.util.SnowflakeUtil; +import java.util.Date; + +public class ProcessTaskActionVo { + + private Long id; + private Long processTaskId; private Long processTaskStepId; private String processTaskStepName; private String trigger; private String triggerText; + private Date triggerTime; private String integrationUuid; private String integrationName; private boolean isSucceed; + private String status; private String statusText; private String error; + private JSONObject config; + @JSONField(serialize = false) + private String configStr; + + public Long getId() { + if (id == null) { + id = SnowflakeUtil.uniqueLong(); + } + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getProcessTaskId() { + return processTaskId; + } + + public void setProcessTaskId(Long processTaskId) { + this.processTaskId = processTaskId; + } + public Long getProcessTaskStepId() { return processTaskStepId; } @@ -35,6 +68,15 @@ public class ActionVo { public void setTriggerText(String triggerText) { this.triggerText = triggerText; } + + public Date getTriggerTime() { + return triggerTime; + } + + public void setTriggerTime(Date triggerTime) { + this.triggerTime = triggerTime; + } + public String getIntegrationUuid() { return integrationUuid; } @@ -53,6 +95,15 @@ public class ActionVo { public void setSucceed(boolean isSucceed) { this.isSucceed = isSucceed; } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + public String getStatusText() { return statusText; } @@ -67,4 +118,26 @@ public class ActionVo { public void setError(String error) { this.error = error; } + + public JSONObject getConfig() { + if (config == null && configStr != null) { + config = JSONObject.parseObject(configStr); + } + return config; + } + + public void setConfig(JSONObject config) { + this.config = config; + } + + public String getConfigStr() { + if (configStr == null && config != null) { + configStr = config.toJSONString(); + } + return configStr; + } + + public void setConfigStr(String configStr) { + this.configStr = configStr; + } } diff --git a/src/main/java/neatlogic/framework/process/dto/ProcessTaskStepVo.java b/src/main/java/neatlogic/framework/process/dto/ProcessTaskStepVo.java index fbf19b98bdefdfa54815b24e9e41b5072e4e7cc6..9bea253374e074339bbd1af38d147206e3edac48 100644 --- a/src/main/java/neatlogic/framework/process/dto/ProcessTaskStepVo.java +++ b/src/main/java/neatlogic/framework/process/dto/ProcessTaskStepVo.java @@ -87,6 +87,8 @@ public class ProcessTaskStepVo extends BasePageVo { private ProcessTaskStepReplyVo comment; @EntityField(name = "评论附件列表", type = ApiParamType.JSONARRAY) private List commentList = new ArrayList<>(); + @EntityField(name = "动作列表", type = ApiParamType.JSONARRAY) + private List actionList = new ArrayList<>(); @EntityField(name = "是否需要上传文件", type = ApiParamType.INTEGER) private Integer isNeedUploadFile; @EntityField(name = "是否需要回复框", type = ApiParamType.INTEGER) @@ -620,6 +622,14 @@ public class ProcessTaskStepVo extends BasePageVo { this.commentList = commentList; } + public List getActionList() { + return actionList; + } + + public void setActionList(List actionList) { + this.actionList = actionList; + } + public Integer getIsView() { return isView; }