abu/wzj-boot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

del 删除无用vo

Browse Source
This commit is contained in:
AprilWind 2024-12-04 14:58:54 +08:00
parent f292439ff0
commit 5887565369
9 changed files with 0 additions and 594 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ActHistoryInfoVo.java
View File

@ -1,87 +0,0 @@
package org.dromara.workflow.domain.vo;
import lombok.Data;
import org.dromara.common.translation.annotation.Translation;
import org.dromara.common.translation.constant.TransConstant;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
/**
* 流程审批记录视图
*
* @author may
*/
@Data
public class ActHistoryInfoVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 任务id
*/
private String id;
/**
* 节点id
*/
private String taskDefinitionKey;
/**
* 任务名称
*/
private String name;
/**
* 流程实例id
*/
private String processInstanceId;
/**
* 版本
*/
private Integer version;
/**
* 开始时间
*/
private Date startTime;
/**
* 结束时间
*/
private Date endTime;
/**
* 运行时长
*/
private String runDuration;
/**
* 状态
*/
private String status;
/**
* 状态
*/
private String statusName;
/**
* 办理人id
*/
private String assignee;
/**
* 办理人名称
*/
@Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "assignee")
private String nickName;
/**
* 办理人id
*/
private String owner;
/**
* 审批信息id
*/
private String commentId;
/**
* 审批信息
*/
private String comment;
}

47
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/GraphicInfoVo.java
View File

@ -1,47 +0,0 @@
package org.dromara.workflow.domain.vo;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
/**
* 节点图形信息
*
* @author may
*/
@Data
public class GraphicInfoVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* x坐标
*/
private double x;
/**
* y坐标
*/
private double y;
/**
* 节点高度
*/
private double height;
/**
* 节点宽度
*/
private double width;
/**
* 节点id
*/
private String nodeId;
/**
* 节点名称
*/
private String nodeName;
}

48
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ModelVo.java
View File

@ -1,48 +0,0 @@
package org.dromara.workflow.domain.vo;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
/**
* 模型视图对象
*
* @author may
*/
@Data
public class ModelVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 模型id
*/
private String id;
/**
* 模型名称
*/
private String name;
/**
* 模型标识key
*/
private String key;
/**
* 模型分类
*/
private String categoryCode;
/**
* 模型XML
*/
private String xml;
/**
* 备注
*/
private String description;
}

33
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/MultiInstanceVo.java
View File

@ -1,33 +0,0 @@
package org.dromara.workflow.domain.vo;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
/**
* 多实例信息
*
* @author may
*/
@Data
public class MultiInstanceVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 会签类型（串行，并行）
*/
private Object type;
/**
* 会签人员KEY
*/
private String assignee;
/**
* 会签人员集合KEY
*/
private String assigneeList;
}

43
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ParticipantVo.java
View File

@ -1,43 +0,0 @@
package org.dromara.workflow.domain.vo;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.util.List;
/**
* 参与者
*
* @author may
*/
@Data
public class ParticipantVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 组id（角色id）
*/
private List<Long> groupIds;
/**
* 候选人id（用户id） 当组id不为空时，将组内人员查出放入candidate
*/
private List<Long> candidate;
/**
* 候选人名称（用户名称） 当组id不为空时，将组内人员查出放入candidateName
*/
private List<String> candidateName;
/**
* 是否认领标识
* 当为空时默认当前任务不需要认领
* 当为true时当前任务说明为候选模式并且有人已经认领了任务可以归还，
* 当为false时当前任务说明为候选模式该任务未认领，
*/
private Boolean claim;
}

70
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ProcessDefinitionVo.java
View File

@ -1,70 +0,0 @@
package org.dromara.workflow.domain.vo;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**
* 流程定义视图
*
* @author may
*/
@Data
public class ProcessDefinitionVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 流程定义id
*/
private String id;
/**
* 流程定义名称
*/
private String name;
/**
* 流程定义标识key
*/
private String key;
/**
* 流程定义版本
*/
private int version;
/**
* 流程定义挂起或激活 1激活 2挂起
*/
private int suspensionState;
/**
* 流程xml名称
*/
private String resourceName;
/**
* 流程图片名称
*/
private String diagramResourceName;
/**
* 流程部署id
*/
private String deploymentId;
/**
* 流程部署时间
*/
private Date deploymentTime;
/**
* 流程定义配置
*/
private WfDefinitionConfigVo wfDefinitionConfigVo;
}

96
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ProcessInstanceVo.java
View File

@ -1,96 +0,0 @@
package org.dromara.workflow.domain.vo;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
/**
* 流程实例视图
*
* @author may
*/
@Data
public class ProcessInstanceVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 流程实例id
*/
private String id;
/**
* 流程定义id
*/
private String processDefinitionId;
/**
* 流程定义名称
*/
private String processDefinitionName;
/**
* 流程定义key
*/
private String processDefinitionKey;
/**
* 流程定义版本
*/
private Integer processDefinitionVersion;
/**
* 部署id
*/
private String deploymentId;
/**
* 业务id
*/
private String businessKey;
/**
* 是否挂起
*/
private Boolean isSuspended;
/**
* 租户id
*/
private String tenantId;
/**
* 启动时间
*/
private Date startTime;
/**
* 结束时间
*/
private Date endTime;
/**
* 启动人id
*/
private String startUserId;
/**
* 流程状态
*/
private String businessStatus;
/**
* 流程状态
*/
private String businessStatusName;
/**
* 待办任务集合
*/
private List<TaskVo> taskVoList;
}

169
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TaskVo.java
View File

@ -1,169 +0,0 @@
package org.dromara.workflow.domain.vo;
import lombok.Data;
import org.dromara.common.translation.annotation.Translation;
import org.dromara.common.translation.constant.TransConstant;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**
* 任务视图
*
* @author may
*/
@Data
public class TaskVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 任务id
*/
private String id;
/**
* 任务名称
*/
private String name;
/**
* 描述
*/
private String description;
/**
* 优先级
*/
private Integer priority;
/**
* 负责此任务的人员的用户id
*/
private String owner;
/**
* 办理人id
*/
private Long assignee;
/**
* 办理人
*/
@Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "assignee")
private String assigneeName;
/**
* 流程实例id
*/
private String processInstanceId;
/**
* 执行id
*/
private String executionId;
/**
* 无用
*/
private String taskDefinitionId;
/**
* 流程定义id
*/
private String processDefinitionId;
/**
* 创建时间
*/
private Date createTime;
/**
* 已办任务-创建时间
*/
private Date startTime;
/**
* 结束时间
*/
private Date endTime;
/**
* 节点id
*/
private String taskDefinitionKey;
/**
* 任务截止日期
*/
private Date dueDate;
/**
* 流程类别
*/
private String category;
/**
* 父级任务id
*/
private String parentTaskId;
/**
* 租户id
*/
private String tenantId;
/**
* 认领时间
*/
private Date claimTime;
/**
* 流程状态
*/
private String businessStatus;
/**
* 流程状态
*/
private String businessStatusName;
/**
* 流程定义名称
*/
private String processDefinitionName;
/**
* 流程定义key
*/
private String processDefinitionKey;
/**
* 流程定义版本
*/
private Integer processDefinitionVersion;
/**
* 参与者
*/
private ParticipantVo participantVo;
/**
* 是否会签
*/
private Boolean multiInstance;
/**
* 业务id
*/
private String businessKey;
/**
* 流程定义配置
*/
private WfDefinitionConfigVo wfDefinitionConfigVo;
}

1
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java
View File

@ -338,7 +338,6 @@ public class FlwTaskServiceImpl implements IFlwTaskService, AssigneeService {
@Override
public boolean backProcess(BackProcessBo bo) {
try {
String userId = LoginHelper.getUserIdStr();
Long taskId = bo.getTaskId();
List<FlowTask> flowTasks = flowTaskMapper.selectList(new LambdaQueryWrapper<>(FlowTask.class).eq(FlowTask::getId, taskId));
if (CollUtil.isEmpty(flowTasks)) {