From 6ded044c082669e48d1bf8a47f5a5b8d4fb441be Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Thu, 5 Dec 2024 17:22:55 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=90=8E=E7=AB=AF-IT?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1-=E6=9D=A1=E4=BB=B6=E8=8A=82=E7=82=B9?= =?UTF-8?q?=E3=80=81=E8=87=AA=E5=8A=A8=E5=8C=96=E8=8A=82=E7=82=B9=E3=80=81?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=BD=AC=E6=8D=A2=E8=8A=82=E7=82=B9=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E6=97=B6=E5=A2=9E=E5=8A=A0=E9=87=8D=E6=96=B0=E6=BF=80?= =?UTF-8?q?=E6=B4=BB=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1305116722823168]后端-IT服务-条件节点、自动化节点、数据转换节点异常时增加重新激活功能 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1305116722823168 --- .../constvalue/ProcessTaskOperationType.java | 42 +------------------ .../ProcessTaskStepOperationType.java | 1 + 2 files changed, 2 insertions(+), 41 deletions(-) diff --git a/src/main/java/neatlogic/framework/process/constvalue/ProcessTaskOperationType.java b/src/main/java/neatlogic/framework/process/constvalue/ProcessTaskOperationType.java index 5c03df82..d69553f5 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 837b1f57..6c1003db 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; -- Gitee