diff --git a/src/main/java/neatlogic/framework/process/constvalue/ProcessTaskOperationType.java b/src/main/java/neatlogic/framework/process/constvalue/ProcessTaskOperationType.java index 5c03df82faa5d0cc9f8e39fb217b585624c389e4..d69553f53bbfd11017110e48dea0f07828a1f195 100644 --- a/src/main/java/neatlogic/framework/process/constvalue/ProcessTaskOperationType.java +++ b/src/main/java/neatlogic/framework/process/constvalue/ProcessTaskOperationType.java @@ -1,7 +1,6 @@ package neatlogic.framework.process.constvalue; import neatlogic.framework.common.constvalue.GroupSearch; -import neatlogic.framework.common.constvalue.UserType; import neatlogic.framework.process.operationauth.core.IOperationType; import neatlogic.framework.process.operationauth.core.OperationAuthHandlerType; @@ -44,46 +43,7 @@ public enum ProcessTaskOperationType implements IOperationType { PROCESSTASK_MARKREPEAT("markrepeat", "标记重复"), PROCESSTASK_COPYPROCESSTASK("copyprocesstask", "复制上报"), PROCESSTASK_FOCUSUSER_UPDATE("updatefocususer", "修改工单关注人"), - /** - * 查看节点信息 - * 无论该节点的状态如何,只有被授权的对象可以查看活动和步骤中所有与该节点相关的信息,否则不可见;(活动是整个活动不可见,步骤只可见步骤名称和状态,其他内容不可见) - * 查看节点信息不会在步骤中记录或生成活动; - */ - STEP_VIEW("view", "查看节点信息", Arrays.asList(GroupSearch.COMMON.getValuePlugin() + UserType.ALL.getValue()), Arrays.asList(GroupSearch.COMMON.getValue(), GroupSearch.USER.getValue(), GroupSearch.TEAM.getValue(), GroupSearch.ROLE.getValue())), - STEP_START("start", "开始"), - STEP_ACTIVE("active", "激活"), - STEP_COMPLETE("complete", "流转"),//下一步骤列表中有未激活的步骤时,有流转权限 - STEP_ACCEPT("accept", "开始"), - STEP_WORK("workcurrentstep", "处理当前步骤"), - STEP_TRANSFER("transfercurrentstep", "转交", Arrays.asList(ProcessTaskGroupSearch.PROCESSUSERTYPE.getValuePlugin() + ProcessUserType.MAJOR.getValue()), Arrays.asList(GroupSearch.COMMON.getValue(), ProcessTaskGroupSearch.PROCESSUSERTYPE.getValue(), GroupSearch.USER.getValue(), GroupSearch.TEAM.getValue(), GroupSearch.ROLE.getValue())), - STEP_BACK("back", "回退"),//下一步骤列表中有已激活的步骤时,有回退权限 - STEP_SAVE("save", "暂存"), - STEP_REAPPROVAL("reapproval", "重审"), - STEP_FAIL("fail", "失败"), - /** - * 修改上报内容 - * 被授权的对象可在该步骤处于‘待处理’或‘进行中’时修改上报内容,如果同时有多个“待处理”或‘进行中’的步骤,则将每个步骤中配置的授权对象取并集; - * 如果是步骤处理人操作,会记录在步骤中,同时生成一条活动;如果是非处理人操作,则步骤中无需记录,只生成活动即可; - */ - STEP_COMMENT("comment", "回复"), - STEP_EDITCOMMENT("editcomment", "编辑回复"), - STEP_DELETECOMMENT("deletecomment", "删除回复"), - /** - * 催办 - * 被授权的对象可在该步骤处于‘待处理’或‘进行中’时催办,如果同时有多个“待处理”或‘进行中’的步骤,则将每个步骤中配置的授权对象取并集,配置的对象都有权限进行催办操作,无论是查看页面还是处理页面,处理人还是非处理人,有权限的用户就能看到该按钮,否则按钮不显示; - * 催办时会生成一条活动,并在对应的步骤中记录;如果配置了催办的通知设置,还会根据配置进行通知; - */ - STEP_PAUSE("pause","暂停", Arrays.asList(ProcessTaskGroupSearch.PROCESSUSERTYPE.getValuePlugin() + ProcessUserType.MAJOR.getValue()), Arrays.asList(GroupSearch.COMMON.getValue(), ProcessTaskGroupSearch.PROCESSUSERTYPE.getValue(), GroupSearch.USER.getValue(), GroupSearch.TEAM.getValue(), GroupSearch.ROLE.getValue())), - STEP_RECOVER("recover", "恢复", Arrays.asList(ProcessTaskGroupSearch.PROCESSUSERTYPE.getValuePlugin() + ProcessUserType.MAJOR.getValue()), Arrays.asList(GroupSearch.COMMON.getValue(), ProcessTaskGroupSearch.PROCESSUSERTYPE.getValue(), GroupSearch.USER.getValue(), GroupSearch.TEAM.getValue(), GroupSearch.ROLE.getValue())), - STEP_RESTFULACTION("restfulaction", "RESTFUL动作"), - STEP_RETREAT("retreatcurrentstep", "撤回", Arrays.asList(ProcessTaskGroupSearch.PROCESSUSERTYPE.getValuePlugin() + ProcessUserType.MAJOR.getValue()), Arrays.asList(GroupSearch.COMMON.getValue(), ProcessTaskGroupSearch.PROCESSUSERTYPE.getValue(), GroupSearch.USER.getValue(), GroupSearch.TEAM.getValue(), GroupSearch.ROLE.getValue())), - STEP_HANG("hang", "挂起"), - STEP_HANDLE("handle", "自动处理"), - STEP_REDO("redo", "重做"), - TASK_CREATE("createtask", "创建任务"), - TASK_EDIT("edittask", "编辑任务"), - TASK_DELETE("deletetask", "删除任务"), - TASK_COMPLETE("completetask", "完成任务"), + PROCESSTASK_REACTIVATE("reactivate", "重新激活"), TRANSFER_EOA_STEP("transfereoastep", "转交审批步骤"), ; private String status; diff --git a/src/main/java/neatlogic/framework/process/constvalue/ProcessTaskStepOperationType.java b/src/main/java/neatlogic/framework/process/constvalue/ProcessTaskStepOperationType.java index 837b1f57dbd5a33921465824758eafa106e20ff0..6c1003db4289e1d225ac911dc4e525a0ed6fea62 100644 --- a/src/main/java/neatlogic/framework/process/constvalue/ProcessTaskStepOperationType.java +++ b/src/main/java/neatlogic/framework/process/constvalue/ProcessTaskStepOperationType.java @@ -51,6 +51,7 @@ public enum ProcessTaskStepOperationType implements IOperationType { TASK_DELETE("deletetask", "删除任务"), TASK_COMPLETE("completetask", "完成任务"), TRANSFER_EOA_STEP("transfereoastep", "转交审批步骤"), + STEP_REACTIVATE("reactivatestep", "重新激活步骤"), ; private String status; private String text;