From 8496a92471d447c53fcd588a3dfd8e683e3a4799 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Mon, 22 Jul 2024 15:22:41 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=90=8E=E7=AB=AF-?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E8=AE=BE=E7=BD=AE=E4=B8=BA=E4=BC=98=E5=85=88?= =?UTF-8?q?=E7=BA=A7=E7=9B=B8=E5=85=B3=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1204412238757888]后端-服务设置为优先级相关逻辑优化 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1204412238757888 --- .../framework/process/dto/ChannelVo.java | 36 +++++++++++-------- .../framework/process/dto/ProcessTaskVo.java | 24 +++++++++---- 2 files changed, 39 insertions(+), 21 deletions(-) diff --git a/src/main/java/neatlogic/framework/process/dto/ChannelVo.java b/src/main/java/neatlogic/framework/process/dto/ChannelVo.java index 2a5851d2..dc8995a4 100644 --- a/src/main/java/neatlogic/framework/process/dto/ChannelVo.java +++ b/src/main/java/neatlogic/framework/process/dto/ChannelVo.java @@ -7,7 +7,6 @@ import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.common.dto.BasePageVo; import neatlogic.framework.common.util.CommonUtil; import neatlogic.framework.restful.annotation.EntityField; -import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import java.util.ArrayList; @@ -63,8 +62,11 @@ public class ChannelVo extends BasePageVo { @EntityField(name = "nmrap.updateprioritysortapi.input.param.desc.prioritylist", type = ApiParamType.JSONARRAY) private List priorityList; - @EntityField(name = "common.isneedpriority", type = ApiParamType.INTEGER) - private Integer isNeedPriority = 1; + @EntityField(name = "common.isactivepriority", type = ApiParamType.INTEGER) + private Integer isActivePriority; + + @EntityField(name = "common.isdisplaypriority", type = ApiParamType.INTEGER) + private Integer isDisplayPriority; @EntityField(name = "common.defaultpriorityuuid", type = ApiParamType.STRING) private String defaultPriorityUuid; @@ -249,6 +251,22 @@ public class ChannelVo extends BasePageVo { this.worktimeUuid = worktimeUuid; } + public Integer getIsActivePriority() { + return isActivePriority; + } + + public void setIsActivePriority(Integer isActivePriority) { + this.isActivePriority = isActivePriority; + } + + public Integer getIsDisplayPriority() { + return isDisplayPriority; + } + + public void setIsDisplayPriority(Integer isDisplayPriority) { + this.isDisplayPriority = isDisplayPriority; + } + public List getPriorityUuidList() { return priorityUuidList; } @@ -446,18 +464,6 @@ public class ChannelVo extends BasePageVo { this.configStr = configStr; } - public Integer getIsNeedPriority() { - //如果不存在优先级List则默认不显示优先级 - if(CollectionUtils.isEmpty(priorityUuidList)){ - isNeedPriority = 0; - } - return isNeedPriority; - } - - public void setIsNeedPriority(Integer isNeedPriority) { - this.isNeedPriority = isNeedPriority; - } - public Boolean getEffectiveAuthority() { return effectiveAuthority; } diff --git a/src/main/java/neatlogic/framework/process/dto/ProcessTaskVo.java b/src/main/java/neatlogic/framework/process/dto/ProcessTaskVo.java index a62e2fdd..3dd9b448 100644 --- a/src/main/java/neatlogic/framework/process/dto/ProcessTaskVo.java +++ b/src/main/java/neatlogic/framework/process/dto/ProcessTaskVo.java @@ -74,8 +74,12 @@ public class ProcessTaskVo extends BasePageVo { private String configHash; private List stepList = new ArrayList<>(); - @EntityField(name = "common.isneedpriority", type = ApiParamType.INTEGER) - private Integer isNeedPriority = 1; + + @EntityField(name = "common.isactivepriority", type = ApiParamType.INTEGER) + private Integer isActivePriority; + + @EntityField(name = "common.isdisplaypriority", type = ApiParamType.INTEGER) + private Integer isDisplayPriority; @EntityField(name = "common.priority", type = ApiParamType.JSONOBJECT) private PriorityVo priority; @EntityField(name = "term.itsm.processtaskformconfig", type = ApiParamType.JSONOBJECT) @@ -773,12 +777,20 @@ public class ProcessTaskVo extends BasePageVo { this.source = source; } - public Integer getIsNeedPriority() { - return isNeedPriority; + public Integer getIsActivePriority() { + return isActivePriority; + } + + public void setIsActivePriority(Integer isActivePriority) { + this.isActivePriority = isActivePriority; + } + + public Integer getIsDisplayPriority() { + return isDisplayPriority; } - public void setIsNeedPriority(Integer isNeedPriority) { - this.isNeedPriority = isNeedPriority; + public void setIsDisplayPriority(Integer isDisplayPriority) { + this.isDisplayPriority = isDisplayPriority; } public String getConfig() { -- Gitee From 27ed88061585db431591868dcbd078dd8171879e Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Mon, 22 Jul 2024 19:32:11 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=90=8E=E7=AB=AF-?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E8=AE=BE=E7=BD=AE=E4=B8=BA=E4=BC=98=E5=85=88?= =?UTF-8?q?=E7=BA=A7=E7=9B=B8=E5=85=B3=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 关联 #[1204412238757888]后端-服务设置为优先级相关逻辑优化 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1204412238757888 --- .../framework/process/dto/ProcessTaskVo.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/main/java/neatlogic/framework/process/dto/ProcessTaskVo.java b/src/main/java/neatlogic/framework/process/dto/ProcessTaskVo.java index 3dd9b448..bb681e13 100644 --- a/src/main/java/neatlogic/framework/process/dto/ProcessTaskVo.java +++ b/src/main/java/neatlogic/framework/process/dto/ProcessTaskVo.java @@ -80,6 +80,9 @@ public class ProcessTaskVo extends BasePageVo { @EntityField(name = "common.isdisplaypriority", type = ApiParamType.INTEGER) private Integer isDisplayPriority; + + @EntityField(name = "common.defaultpriorityuuid", type = ApiParamType.STRING) + private String defaultPriorityUuid; @EntityField(name = "common.priority", type = ApiParamType.JSONOBJECT) private PriorityVo priority; @EntityField(name = "term.itsm.processtaskformconfig", type = ApiParamType.JSONOBJECT) @@ -793,6 +796,14 @@ public class ProcessTaskVo extends BasePageVo { this.isDisplayPriority = isDisplayPriority; } + public String getDefaultPriorityUuid() { + return defaultPriorityUuid; + } + + public void setDefaultPriorityUuid(String defaultPriorityUuid) { + this.defaultPriorityUuid = defaultPriorityUuid; + } + public String getConfig() { return config; } -- Gitee From d087ae49160747ff26428071e24df9ff964930b3 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Mon, 22 Jul 2024 20:03:25 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=90=8E=E7=AB=AF-?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E8=AE=BE=E7=BD=AE=E4=B8=BA=E4=BC=98=E5=85=88?= =?UTF-8?q?=E7=BA=A7=E7=9B=B8=E5=85=B3=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 关联 #[1204412238757888]后端-服务设置为优先级相关逻辑优化 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1204412238757888 --- src/main/java/neatlogic/framework/process/dto/ChannelVo.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/neatlogic/framework/process/dto/ChannelVo.java b/src/main/java/neatlogic/framework/process/dto/ChannelVo.java index dc8995a4..a3febee5 100644 --- a/src/main/java/neatlogic/framework/process/dto/ChannelVo.java +++ b/src/main/java/neatlogic/framework/process/dto/ChannelVo.java @@ -127,6 +127,8 @@ public class ChannelVo extends BasePageVo { this.uuid = channelVo.uuid; this.name = channelVo.name; this.isActive = channelVo.isActive; + this.isActivePriority = channelVo.isActivePriority; + this.isDisplayPriority = channelVo.isDisplayPriority; this.desc = channelVo.desc; this.icon = channelVo.icon; this.color = channelVo.color; -- Gitee