diff --git a/src/main/java/neatlogic/framework/process/dto/ChannelVo.java b/src/main/java/neatlogic/framework/process/dto/ChannelVo.java index 2a5851d295ccd4634481126068b57089d5aa5be7..a3febee55755a8f5455d28fab6527a761946d6a7 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; @@ -125,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; @@ -249,6 +253,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 +466,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 a62e2fddd2674164ed2566fd2da434ca358be91c..bb681e1320cb78d3675beb8c28597d5d08af6e35 100644 --- a/src/main/java/neatlogic/framework/process/dto/ProcessTaskVo.java +++ b/src/main/java/neatlogic/framework/process/dto/ProcessTaskVo.java @@ -74,8 +74,15 @@ 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.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) @@ -773,12 +780,28 @@ 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 setIsDisplayPriority(Integer isDisplayPriority) { + this.isDisplayPriority = isDisplayPriority; + } + + public String getDefaultPriorityUuid() { + return defaultPriorityUuid; } - public void setIsNeedPriority(Integer isNeedPriority) { - this.isNeedPriority = isNeedPriority; + public void setDefaultPriorityUuid(String defaultPriorityUuid) { + this.defaultPriorityUuid = defaultPriorityUuid; } public String getConfig() {