update 优化增加人员类型枚举,删除无用常量

This commit is contained in:
AprilWind 2024-12-04 17:39:47 +08:00
parent 4e2090c5f4
commit 51a3bc9c4e
4 changed files with 51 additions and 7 deletions

View File

@ -23,8 +23,4 @@ public interface FlowConstant {
*/
String BUSINESS_KEY = "businessKey";
/**
* 模型标识key命名规范正则表达式
*/
String MODEL_KEY_PATTERN = "^[a-zA-Z][a-zA-Z0-9_]{0,254}$";
}

View File

@ -0,0 +1,49 @@
package org.dromara.workflow.common.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* 人员类型
*
* @author AprilWind
*/
@Getter
@AllArgsConstructor
public enum TaskAssigneeType {
/**
* 待办任务的审批人权限
* <p>该权限表示用户是待办任务的审批人负责审核任务的执行情况</p>
*/
APPROVER("1", "待办任务的审批人权限"),
/**
* 待办任务的转办人权限
* <p>该权限表示用户是待办任务的转办人负责将任务分配给其他人员</p>
*/
TRANSFER("2", "待办任务的转办人权限"),
/**
* 待办任务的委托人权限
* <p>该权限表示用户是待办任务的委托人能够委托其他人代为处理任务</p>
*/
DELEGATE("3", "待办任务的委托人权限"),
/**
* 待办任务的抄送人权限
* <p>该权限表示用户是待办任务的抄送人仅接收任务信息的通知不参与任务的审批或处理</p>
*/
COPY("4", "待办任务的抄送人权限");
/**
* 类型
*/
private final String code;
/**
* 描述
*/
private final String description;
}

View File

@ -131,5 +131,4 @@ public class FlwInstanceController extends BaseController {
return R.ok(flwInstanceService.getInstanceVariable(instanceId));
}
}

View File

@ -28,6 +28,7 @@ import org.dromara.warm.flow.orm.entity.*;
import org.dromara.warm.flow.orm.mapper.FlowHisTaskMapper;
import org.dromara.warm.flow.orm.mapper.FlowSkipMapper;
import org.dromara.warm.flow.orm.mapper.FlowTaskMapper;
import org.dromara.workflow.common.enums.TaskAssigneeType;
import org.dromara.workflow.common.enums.TaskStatusEnum;
import org.dromara.workflow.domain.bo.*;
import org.dromara.workflow.domain.vo.FlowHisTaskVo;
@ -47,7 +48,6 @@ import org.springframework.transaction.annotation.Transactional;
import java.util.*;
import java.util.stream.Collectors;
import static org.dromara.common.core.enums.TaskAssigneeEnum.USER;
import static org.dromara.workflow.common.constant.FlowConstant.*;
/**
@ -233,7 +233,7 @@ public class FlwTaskServiceImpl implements IFlwTaskService, AssigneeService {
List<User> userList = new ArrayList<>();
for (WfCopy wfCopy : wfCopyList) {
FlowUser flowUser = new FlowUser();
flowUser.setType(String.valueOf(4));
flowUser.setType(TaskAssigneeType.COPY.getCode());
flowUser.setProcessedBy(wfCopy.getUserId());
flowUser.setAssociated(taskId);
userList.add(flowUser);