diff --git a/src/main/java/com/lz/modules/flow/entity/FlowChart.java b/src/main/java/com/lz/modules/flow/entity/FlowChart.java index f07f6891..8a905d87 100644 --- a/src/main/java/com/lz/modules/flow/entity/FlowChart.java +++ b/src/main/java/com/lz/modules/flow/entity/FlowChart.java @@ -8,10 +8,9 @@ import lombok.Data; import java.util.Date; /** *
-* 菜单权限表 *
*流程图,lz_flow的父 * @author quyixiao -* @since 2020-10-14 +* @since 2020-10-26 */ @Data @@ -39,12 +38,15 @@ public class FlowChart implements java.io.Serializable { //是否可允许不启用节点 0不可,1可以 @ApiModelProperty(value = "是否可允许不启用节点 0不可,1可以", name = "status") private Integer status; - //1可配置细节,0不可配置细节,一般线下操作。比如执行中 - @ApiModelProperty(value = "1可配置细节,0不可配置细节,一般线下操作。比如执行中", name = "type") + //1可配置细节,0不可配置细节,一般线下操作。比如执行中,不可配置细节的允许自动跳过该节点。比如,还未到改节点时,人为设置该节点后面的操作,那么所有相关的都自动跳过 + @ApiModelProperty(value = "1可配置细节,0不可配置细节,一般线下操作。比如执行中,不可配置细节的允许自动跳过该节点。比如,还未到改节点时,人为设置该节点后面的操作,那么所有相关的都自动跳过", name = "type") private Integer type; //执行步骤,第几步,从0开始 @ApiModelProperty(value = "执行步骤,第几步,从0开始", name = "stepIndex") private Integer stepIndex; + //当前是目标确认还是评分,0,目标制定,1,目标确认,2执行中,3,结果值录入,4,评分,5考核结束 + @ApiModelProperty(value = "当前是目标确认还是评分,0,目标制定,1,目标确认,2执行中,3,结果值录入,4,评分,5考核结束", name = "flowProcess") + private Integer flowProcess; /** * * @return @@ -136,14 +138,14 @@ public class FlowChart implements java.io.Serializable { } /** - * 0启用,1不启用 + * 是否可允许不启用节点 0不可,1可以 * @return */ public Integer getStatus() { return status; } /** - * 0启用,1不启用 + * 是否可允许不启用节点 0不可,1可以 * @param status */ public void setStatus(Integer status) { @@ -151,14 +153,14 @@ public class FlowChart implements java.io.Serializable { } /** - * 1可配置细节,0不可配置细节,一般线下操作。比如执行中 + * 1可配置细节,0不可配置细节,一般线下操作。比如执行中,不可配置细节的允许自动跳过该节点。比如,还未到改节点时,人为设置该节点后面的操作,那么所有相关的都自动跳过 * @return */ public Integer getType() { return type; } /** - * 1可配置细节,0不可配置细节,一般线下操作。比如执行中 + * 1可配置细节,0不可配置细节,一般线下操作。比如执行中,不可配置细节的允许自动跳过该节点。比如,还未到改节点时,人为设置该节点后面的操作,那么所有相关的都自动跳过 * @param type */ public void setType(Integer type) { @@ -180,6 +182,21 @@ public class FlowChart implements java.io.Serializable { this.stepIndex = stepIndex; } + /** + * 当前是目标确认还是评分,0,目标制定,1,目标确认,2执行中,3,结果值录入,4,评分,5考核结束 + * @return + */ + public Integer getFlowProcess() { + return flowProcess; + } + /** + * 当前是目标确认还是评分,0,目标制定,1,目标确认,2执行中,3,结果值录入,4,评分,5考核结束 + * @param flowProcess + */ + public void setFlowProcess(Integer flowProcess) { + this.flowProcess = flowProcess; + } + @Override public String toString() { return "FlowChart{" + @@ -192,6 +209,7 @@ public class FlowChart implements java.io.Serializable { ",status=" + status + ",type=" + type + ",stepIndex=" + stepIndex + + ",flowProcess=" + flowProcess + "}"; } } \ No newline at end of file diff --git a/src/main/resources/mapper/flow/FlowChartMapper.xml b/src/main/resources/mapper/flow/FlowChartMapper.xml index 805a0347..009a4bff 100644 --- a/src/main/resources/mapper/flow/FlowChartMapper.xml +++ b/src/main/resources/mapper/flow/FlowChartMapper.xml @@ -13,12 +13,13 @@