From 36f0d36dd750f5949d59c9ea45378e91e5ab902a Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Wed, 28 Aug 2024 16:20:47 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=90=8E=E7=AB=AF-?= =?UTF-8?q?=E5=B7=A5=E5=8D=95=E5=8A=A8=E4=BD=9C=E6=8F=90=E7=A4=BA=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1233334296870912]后端-工单动作提示优化 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1233334296870912 --- ...ActionVo.java => ProcessTaskActionVo.java} | 73 ++++++++++++++++++- .../process/dto/ProcessTaskStepVo.java | 10 +++ 2 files changed, 82 insertions(+), 1 deletion(-) rename src/main/java/neatlogic/framework/process/dto/{ActionVo.java => ProcessTaskActionVo.java} (56%) mode change 100755 => 100644 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 56% rename from src/main/java/neatlogic/framework/process/dto/ActionVo.java rename to src/main/java/neatlogic/framework/process/dto/ProcessTaskActionVo.java index 24d3eba4..adc61cb2 --- a/src/main/java/neatlogic/framework/process/dto/ActionVo.java +++ b/src/main/java/neatlogic/framework/process/dto/ProcessTaskActionVo.java @@ -1,16 +1,47 @@ package neatlogic.framework.process.dto; -public class ActionVo { +import com.alibaba.fastjson.JSONObject; +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; + 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 +66,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 +93,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 +116,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 fbf19b98..9bea2533 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; } -- Gitee From 87dfc0d0ee8e7b2b37ecee2fb8856a48d511efd1 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Wed, 28 Aug 2024 16:23:44 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=90=8E=E7=AB=AF-?= =?UTF-8?q?=E5=B7=A5=E5=8D=95=E5=8A=A8=E4=BD=9C=E6=8F=90=E7=A4=BA=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1233334296870912]后端-工单动作提示优化 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1233334296870912 --- .../neatlogic/framework/process/dto/ProcessTaskActionVo.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/neatlogic/framework/process/dto/ProcessTaskActionVo.java b/src/main/java/neatlogic/framework/process/dto/ProcessTaskActionVo.java index adc61cb2..32bfc7a8 100644 --- a/src/main/java/neatlogic/framework/process/dto/ProcessTaskActionVo.java +++ b/src/main/java/neatlogic/framework/process/dto/ProcessTaskActionVo.java @@ -1,6 +1,7 @@ package neatlogic.framework.process.dto; import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson.annotation.JSONField; import neatlogic.framework.util.SnowflakeUtil; import java.util.Date; @@ -21,6 +22,7 @@ public class ProcessTaskActionVo { private String statusText; private String error; private JSONObject config; + @JSONField(serialize = false) private String configStr; public Long getId() { -- Gitee