DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sync -- 同步 RuoYi-Vue-Plus（v4.3.0） 更新

Browse Source
This commit is contained in:
konbai
2022-09-18 23:27:06 +08:00
parent 4bc7e08889
commit ccf8393808
254 changed files with 3697 additions and 2679 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-system/src/main/java/com/ruoyi/workflow/domain/WfDeployForm.java
View File

@@ -1,7 +1,6 @@
package com.ruoyi.workflow.domain;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import lombok.Data;
/**
@@ -12,7 +11,6 @@ import lombok.Data;
*/
@Data
@TableName("wf_deploy_form")
@ApiModel("部署实例和表单关联")
public class WfDeployForm {
private static final long serialVersionUID = 1L;

7
ruoyi-system/src/main/java/com/ruoyi/workflow/domain/bo/WfCategoryBo.java
View File

@@ -3,8 +3,6 @@ package com.ruoyi.workflow.domain.bo;
import com.ruoyi.common.core.domain.BaseEntity;
import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -20,34 +18,29 @@ import javax.validation.constraints.NotNull;
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel("流程分类业务对象")
public class WfCategoryBo extends BaseEntity {
/**
* 分类ID
*/
@ApiModelProperty(value = "分类ID", required = true)
@NotNull(message = "分类ID不能为空", groups = { EditGroup.class })
private Long categoryId;
/**
* 分类名称
*/
@ApiModelProperty(value = "分类名称", required = true)
@NotBlank(message = "分类名称不能为空", groups = { AddGroup.class, EditGroup.class })
private String categoryName;
/**
* 分类编码
*/
@ApiModelProperty(value = "分类编码", required = true)
@NotBlank(message = "分类编码不能为空", groups = { AddGroup.class, EditGroup.class })
private String code;
/**
* 备注
*/
@ApiModelProperty(value = "备注", required = true)
@NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
private String remark;

12
ruoyi-system/src/main/java/com/ruoyi/workflow/domain/bo/WfCopyBo.java
View File

@@ -3,8 +3,6 @@ package com.ruoyi.workflow.domain.bo;
import com.ruoyi.common.core.domain.BaseEntity;
import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -20,68 +18,58 @@ import javax.validation.constraints.NotNull;
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel("流程抄送业务对象")
public class WfCopyBo extends BaseEntity {
/**
* 抄送主键
*/
@ApiModelProperty(value = "抄送主键", required = true)
@NotNull(message = "抄送主键不能为空", groups = { EditGroup.class })
private Long copyId;
/**
* 抄送标题
*/
@ApiModelProperty(value = "抄送标题", required = true)
@NotNull(message = "抄送标题不能为空", groups = { AddGroup.class, EditGroup.class })
private String title;
/**
* 流程主键
*/
@ApiModelProperty(value = "流程主键", required = true)
@NotBlank(message = "流程主键不能为空", groups = { AddGroup.class, EditGroup.class })
private String processId;
/**
* 流程名称
*/
@ApiModelProperty(value = "流程名称", required = true)
@NotBlank(message = "流程名称不能为空", groups = { AddGroup.class, EditGroup.class })
private String processName;
/**
* 流程分类主键
*/
@ApiModelProperty(value = "流程分类主键", required = true)
@NotBlank(message = "流程分类主键不能为空", groups = { AddGroup.class, EditGroup.class })
private String categoryId;
/**
* 任务主键
*/
@ApiModelProperty(value = "任务主键", required = true)
@NotBlank(message = "任务主键不能为空", groups = { AddGroup.class, EditGroup.class })
private String taskId;
/**
* 用户主键
*/
@ApiModelProperty(value = "用户主键", required = true)
@NotNull(message = "用户主键不能为空", groups = { AddGroup.class, EditGroup.class })
private Long userId;
/**
* 发起人Id
*/
@ApiModelProperty(value = "发起人主键", required = true)
@NotNull(message = "发起人主键不能为空", groups = { AddGroup.class, EditGroup.class })
private Long originatorId;
/**
* 发起人名称
*/
@ApiModelProperty(value = "发起人名称", required = true)
@NotNull(message = "发起人名称不能为空", groups = { AddGroup.class, EditGroup.class })
private String originatorName;
}

6
ruoyi-system/src/main/java/com/ruoyi/workflow/domain/bo/WfDesignerBo.java
View File

@@ -2,8 +2,6 @@ package com.ruoyi.workflow.domain.bo;
import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
@@ -16,20 +14,17 @@ import javax.validation.constraints.NotNull;
* @createTime 2022/3/10 00:12
*/
@Data
@ApiModel("流程设计业务对象")
public class WfDesignerBo {
/**
* 流程名称
*/
@ApiModelProperty(value = "流程名称", required = true)
@NotNull(message = "流程名称", groups = { AddGroup.class, EditGroup.class })
private String name;
/**
* 流程分类
*/
@ApiModelProperty(value = "流程分类", required = true)
@NotBlank(message = "流程分类", groups = { AddGroup.class, EditGroup.class })
private String category;
@@ -37,6 +32,5 @@ public class WfDesignerBo {
* XML字符串
*/
@NotBlank(message = "XML字符串", groups = { AddGroup.class, EditGroup.class })
@ApiModelProperty(value = "XML字符串", required = true)
private String xml;
}

7
ruoyi-system/src/main/java/com/ruoyi/workflow/domain/bo/WfFormBo.java
View File

@@ -3,8 +3,6 @@ package com.ruoyi.workflow.domain.bo;
import com.ruoyi.common.core.domain.BaseEntity;
import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -19,34 +17,29 @@ import javax.validation.constraints.NotNull;
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel("流程表单业务对象")
public class WfFormBo extends BaseEntity {
private static final long serialVersionUID = 1L;
/**
* 表单主键
*/
@ApiModelProperty(value = "表单ID", required = true)
@NotNull(message = "表单ID不能为空", groups = { EditGroup.class })
private Long formId;
/**
* 表单名称
*/
@ApiModelProperty(value = "表单名称", required = true)
@NotBlank(message = "表单名称不能为空", groups = { AddGroup.class, EditGroup.class })
private String formName;
/**
* 表单内容
*/
@ApiModelProperty(value = "表单内容", required = true)
@NotBlank(message = "表单内容不能为空", groups = { AddGroup.class, EditGroup.class })
private String content;
/**
* 备注
*/
@ApiModelProperty(value = "备注", required = true)
private String remark;
}

50
ruoyi-system/src/main/java/com/ruoyi/workflow/domain/bo/WfModelBo.java
View File

@@ -2,49 +2,57 @@ package com.ruoyi.workflow.domain.bo;
import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
/**
* 流程模型对象
*
* @author KonBAI
* @createTime 2022/6/21 9:16
*/
@Data
@ApiModel("流程模型对象")
public class WfModelBo {
@ApiModelProperty(value = "模型主键")
/**
* 模型主键
*/
@NotNull(message = "模型主键不能为空", groups = { EditGroup.class })
private String modelId;
@ApiModelProperty(value = "模型名称", required = true)
/**
* 模型名称
*/
@NotNull(message = "模型名称不能为空", groups = { AddGroup.class, EditGroup.class })
private String modelName;
@ApiModelProperty(value = "模型Key", required = true)
/**
* 模型Key
*/
@NotNull(message = "模型Key不能为空", groups = { AddGroup.class, EditGroup.class })
private String modelKey;
@ApiModelProperty(value = "流程分类", required = true)
/**
* 流程分类
*/
@NotBlank(message = "流程分类不能为空", groups = { AddGroup.class, EditGroup.class })
private String category;
@ApiModelProperty(value = "描述")
/**
* 描述
*/
private String description;
@ApiModelProperty(value = "表单类型", required = true)
/**
* 表单类型
*/
private Integer formType;
@ApiModelProperty(value = "表单主键", required = true)
/**
* 表单主键
*/
private Long formId;
@ApiModelProperty(value = "流程xml", required = true)
/**
* 流程xml
*/
private String bpmnXml;
@ApiModelProperty(value = "是否保存为新版本", required = true)
/**
* 是否保存为新版本
*/
private Boolean newVersion;
}

19
ruoyi-system/src/main/java/com/ruoyi/workflow/domain/bo/WfProcessBo.java
View File

@@ -1,7 +1,5 @@
package com.ruoyi.workflow.domain.bo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
@@ -11,18 +9,25 @@ import lombok.Data;
* @createTime 2022/6/11 01:15
*/
@Data
@ApiModel("流程业务对象")
public class WfProcessBo {
@ApiModelProperty("流程标识")
/**
* 流程标识
*/
private String processKey;
@ApiModelProperty("流程名称")
/**
* 流程名称
*/
private String processName;
@ApiModelProperty("流程分类")
/**
* 流程分类
*/
private String category;
@ApiModelProperty("状态")
/**
* 状态
*/
private String state;
}

58
ruoyi-system/src/main/java/com/ruoyi/workflow/domain/bo/WfTaskBo.java
View File

@@ -1,7 +1,5 @@
package com.ruoyi.workflow.domain.bo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@@ -14,39 +12,49 @@ import java.util.Map;
* @createTime 2022/3/10 00:12
*/
@Data
@ApiModel("流程任务业务对象")
public class WfTaskBo {
@ApiModelProperty("任务Id")
/**
* 任务Id
*/
private String taskId;
@ApiModelProperty("任务名称")
/**
* 任务名称
*/
private String taskName;
@ApiModelProperty("用户Id")
/**
* 用户Id
*/
private String userId;
@ApiModelProperty("任务意见")
/**
* 任务意见
*/
private String comment;
@ApiModelProperty("流程实例Id")
/**
* 流程实例Id
*/
private String procInsId;
@ApiModelProperty("节点")
/**
* 节点
*/
private String targetKey;
@ApiModelProperty("流程变量信息")
/**
* 流程变量信息
*/
private Map<String, Object> variables;
@ApiModelProperty("审批人")
/**
* 审批人
*/
private String assignee;
@ApiModelProperty("候选人")
/**
* 候选人
*/
private List<String> candidateUsers;
@ApiModelProperty("审批组")
/**
* 审批组
*/
private List<String> candidateGroups;
@ApiModelProperty("抄送用户Id")
/**
* 抄送用户Id
*/
private String copyUserIds;
}

7
ruoyi-system/src/main/java/com/ruoyi/workflow/domain/vo/WfCategoryVo.java
View File

@@ -2,8 +2,6 @@ package com.ruoyi.workflow.domain.vo;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -15,7 +13,6 @@ import lombok.Data;
* @date 2022-01-15
*/
@Data
@ApiModel("流程分类视图对象")
@ExcelIgnoreUnannotated
public class WfCategoryVo {
@@ -25,28 +22,24 @@ public class WfCategoryVo {
* 分类ID
*/
@ExcelProperty(value = "分类ID")
@ApiModelProperty("分类ID")
private Long categoryId;
/**
* 分类名称
*/
@ExcelProperty(value = "分类名称")
@ApiModelProperty("分类名称")
private String categoryName;
/**
* 分类编码
*/
@ExcelProperty(value = "分类编码")
@ApiModelProperty("分类编码")
private String code;
/**
* 备注
*/
@ExcelProperty(value = "备注")
@ApiModelProperty("备注")
private String remark;

4
ruoyi-system/src/main/java/com/ruoyi/workflow/domain/vo/WfCommentVo.java
View File

@@ -1,16 +1,16 @@
package com.ruoyi.workflow.domain.vo;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import java.util.Date;
/**
* 流程批复视图对象
*
* @author konbai
* @createTime 2022/4/4 02:03
*/
@Data
@ApiModel("流程批复视图对象")
public class WfCommentVo {
/**

15
ruoyi-system/src/main/java/com/ruoyi/workflow/domain/vo/WfCopyVo.java
View File

@@ -2,8 +2,6 @@ package com.ruoyi.workflow.domain.vo;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
@@ -16,7 +14,6 @@ import java.util.Date;
* @date 2022-05-19
*/
@Data
@ApiModel("流程抄送视图对象")
@ExcelIgnoreUnannotated
public class WfCopyVo {
@@ -26,83 +23,71 @@ public class WfCopyVo {
* 抄送主键
*/
@ExcelProperty(value = "抄送主键")
@ApiModelProperty("抄送主键")
private Long copyId;
/**
* 抄送标题
*/
@ExcelProperty(value = "抄送标题")
@ApiModelProperty("抄送标题")
private String title;
/**
* 流程主键
*/
@ExcelProperty(value = "流程主键")
@ApiModelProperty("流程主键")
private String processId;
/**
* 流程名称
*/
@ExcelProperty(value = "流程名称")
@ApiModelProperty("流程名称")
private String processName;
/**
* 流程分类主键
*/
@ExcelProperty(value = "流程分类主键")
@ApiModelProperty("流程分类主键")
private String categoryId;
/**
* 部署主键
*/
@ExcelProperty(value = "部署主键")
@ApiModelProperty("部署主键")
private String deploymentId;
/**
* 流程实例主键
*/
@ExcelProperty(value = "流程实例主键")
@ApiModelProperty("流程实例主键")
private String instanceId;
/**
* 任务主键
*/
@ExcelProperty(value = "任务主键")
@ApiModelProperty("任务主键")
private String taskId;
/**
* 用户主键
*/
@ExcelProperty(value = "用户主键")
@ApiModelProperty("用户主键")
private Long userId;
/**
* 发起人Id
*/
@ExcelProperty(value = "发起人主键")
@ApiModelProperty("发起人主键")
private Long originatorId;
/**
* 发起人名称
*/
@ExcelProperty(value = "发起人名称")
@ApiModelProperty("发起人名称")
private String originatorName;
/**
* 抄送时间（创建时间）
*/
@ExcelProperty(value = "抄送时间")
@ApiModelProperty("抄送时间")
private Date createTime;
}

17
ruoyi-system/src/main/java/com/ruoyi/workflow/domain/vo/WfDefinitionVo.java
View File

@@ -2,8 +2,6 @@ package com.ruoyi.workflow.domain.vo;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
@@ -17,7 +15,6 @@ import java.util.Date;
* @date 2022-01-17
*/
@Data
@ApiModel("流程定义视图对象")
@ExcelIgnoreUnannotated
public class WfDefinitionVo {
@@ -27,65 +24,59 @@ public class WfDefinitionVo {
* 流程定义ID
*/
@ExcelProperty(value = "流程定义ID")
@ApiModelProperty("流程定义ID")
private String definitionId;
/**
* 流程名称
*/
@ExcelProperty(value = "流程名称")
@ApiModelProperty("流程名称")
private String processName;
/**
* 流程Key
*/
@ExcelProperty(value = "流程Key")
@ApiModelProperty("流程Key")
private String processKey;
/**
* 分类编码
*/
@ExcelProperty(value = "分类编码")
@ApiModelProperty("分类编码")
private String category;
@ApiModelProperty("版本")
/**
* 版本
*/
@ExcelProperty(value = "版本")
private Integer version;
/**
* 表单ID
*/
@ExcelProperty(value = "表单ID")
@ApiModelProperty("表单ID")
private Long formId;
/**
* 表单名称
*/
@ExcelProperty(value = "表单名称")
@ApiModelProperty("表单名称")
private String formName;
/**
* 部署ID
*/
@ExcelProperty(value = "部署ID")
@ApiModelProperty("部署ID")
private String deploymentId;
/**
* 流程定义状态: 1:激活 , 2:中止
*/
@ExcelProperty(value = "流程定义状态: 1:激活 , 2:中止")
@ApiModelProperty("流程定义状态: 1:激活 , 2:中止")
private Boolean suspended;
/**
* 部署时间
*/
@ExcelProperty(value = "部署时间")
@ApiModelProperty("部署时间")
private Date deploymentTime;
}

10
ruoyi-system/src/main/java/com/ruoyi/workflow/domain/vo/WfDeployFormVo.java
View File

@@ -1,15 +1,14 @@
package com.ruoyi.workflow.domain.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* 部署实例和表单关联视图对象
*
* @author KonBAI
* @createTime 2022/7/17 18:29
*/
@Data
@ApiModel("部署实例和表单关联视图对象")
public class WfDeployFormVo {
private static final long serialVersionUID = 1L;
@@ -17,30 +16,25 @@ public class WfDeployFormVo {
/**
* 流程部署主键
*/
@ApiModelProperty("流程部署主键")
private String deployId;
/**
* 表单Key
*/
@ApiModelProperty("表单Key")
private String formKey;
/**
* 节点Key
*/
@ApiModelProperty("节点Key")
private String nodeKey;
/**
* 节点名称
*/
@ApiModelProperty("节点名称")
private String nodeName;
/**
* 表单内容
*/
@ApiModelProperty("表单内容")
private String content;
}

16
ruoyi-system/src/main/java/com/ruoyi/workflow/domain/vo/WfDeployVo.java
View File

@@ -2,8 +2,6 @@ package com.ruoyi.workflow.domain.vo;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
@@ -16,7 +14,6 @@ import java.util.Date;
* @date 2022-06-30
*/
@Data
@ApiModel("流程部署视图对象")
@ExcelIgnoreUnannotated
public class WfDeployVo {
@@ -26,65 +23,58 @@ public class WfDeployVo {
* 流程定义ID
*/
@ExcelProperty(value = "流程定义ID")
@ApiModelProperty("流程定义ID")
private String definitionId;
/**
* 流程名称
*/
@ExcelProperty(value = "流程名称")
@ApiModelProperty("流程名称")
private String processName;
/**
* 流程Key
*/
@ExcelProperty(value = "流程Key")
@ApiModelProperty("流程Key")
private String processKey;
/**
* 分类编码
*/
@ExcelProperty(value = "分类编码")
@ApiModelProperty("分类编码")
private String category;
@ApiModelProperty("版本")
/**
* 版本
*/
private Integer version;
/**
* 表单ID
*/
@ExcelProperty(value = "表单ID")
@ApiModelProperty("表单ID")
private Long formId;
/**
* 表单名称
*/
@ExcelProperty(value = "表单名称")
@ApiModelProperty("表单名称")
private String formName;
/**
* 部署ID
*/
@ExcelProperty(value = "部署ID")
@ApiModelProperty("部署ID")
private String deploymentId;
/**
* 流程定义状态: 1:激活 , 2:中止
*/
@ExcelProperty(value = "流程定义状态: 1:激活 , 2:中止")
@ApiModelProperty("流程定义状态: 1:激活 , 2:中止")
private Boolean suspended;
/**
* 部署时间
*/
@ExcelProperty(value = "部署时间")
@ApiModelProperty("部署时间")
private Date deploymentTime;
}

2
ruoyi-system/src/main/java/com/ruoyi/workflow/domain/vo/WfDetailVo.java
View File

@@ -2,7 +2,6 @@ package com.ruoyi.workflow.domain.vo;
import cn.hutool.core.util.ObjectUtil;
import com.ruoyi.flowable.core.FormConf;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import java.util.List;
@@ -14,7 +13,6 @@ import java.util.List;
* @createTime 2022/8/7 15:01
*/
@Data
@ApiModel("流程详情视图对象")
public class WfDetailVo {
/**

9
ruoyi-system/src/main/java/com/ruoyi/workflow/domain/vo/WfFormVo.java
View File

@@ -2,16 +2,15 @@ package com.ruoyi.workflow.domain.vo;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* 流程分类视图对象
*
* @author KonBAI
* @createTime 2022/3/7 22:07
*/
@Data
@ApiModel("流程分类视图对象")
@ExcelIgnoreUnannotated
public class WfFormVo {
@@ -21,27 +20,23 @@ public class WfFormVo {
* 表单主键
*/
@ExcelProperty(value = "表单ID")
@ApiModelProperty("表单ID")
private Long formId;
/**
* 表单名称
*/
@ExcelProperty(value = "表单名称")
@ApiModelProperty("表单名称")
private String formName;
/**
* 表单内容
*/
@ExcelProperty(value = "表单内容")
@ApiModelProperty("表单内容")
private String content;
/**
* 备注
*/
@ExcelProperty(value = "备注")
@ApiModelProperty("备注")
private String remark;
}

60
ruoyi-system/src/main/java/com/ruoyi/workflow/domain/vo/WfModelVo.java
View File

@@ -2,62 +2,72 @@ package com.ruoyi.workflow.domain.vo;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* 流程模型视图对象
*
* @author KonBAI
* @createTime 2022/6/21 9:16
*/
@Data
@ApiModel("流程模型视图对象")
@ExcelIgnoreUnannotated
public class WfModelVo {
/**
* 模型ID
*/
@ExcelProperty(value = "模型ID")
@ApiModelProperty("模型ID")
private String modelId;
/**
* 模型名称
*/
@ExcelProperty(value = "模型名称")
@ApiModelProperty("模型名称")
private String modelName;
/**
* 模型Key
*/
@ExcelProperty(value = "模型Key")
@ApiModelProperty("模型Key")
private String modelKey;
/**
* 分类编码
*/
@ExcelProperty(value = "分类编码")
@ApiModelProperty("分类编码")
private String category;
/**
* 版本
*/
@ExcelProperty(value = "版本")
@ApiModelProperty("版本")
private Integer version;
/**
* 表单类型
*/
@ExcelProperty(value = "表单类型")
@ApiModelProperty("表单类型")
private Integer formType;
/**
* 表单ID
*/
@ExcelProperty(value = "表单ID")
@ApiModelProperty("表单ID")
private Long formId;
/**
* 模型描述
*/
@ExcelProperty(value = "模型描述")
@ApiModelProperty("模型描述")
private String description;
/**
* 创建时间
*/
@ExcelProperty(value = "创建时间")
@ApiModelProperty("创建时间")
private Date createTime;
/**
* 流程xml
*/
@ExcelProperty(value = "流程xml")
@ApiModelProperty("流程xml")
private String bpmnXml;
/**
* 表单内容
*/
@ExcelProperty(value = "表单内容")
@ApiModelProperty("表单内容")
private String content;
}

128
ruoyi-system/src/main/java/com/ruoyi/workflow/domain/vo/WfTaskVo.java
View File

@@ -3,8 +3,6 @@ package com.ruoyi.workflow.domain.vo;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.workflow.domain.dto.WfCommentDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.flowable.engine.task.Comment;
@@ -19,84 +17,108 @@ import java.util.List;
* @createTime 2022/3/10 00:12
*/
@Data
@ApiModel("工作流任务视图对象")
@ExcelIgnoreUnannotated
public class WfTaskVo implements Serializable {
@ApiModelProperty("任务编号")
/**
* 任务编号
*/
private String taskId;
@ApiModelProperty("任务名称")
/**
* 任务名称
*/
private String taskName;
@ApiModelProperty("任务Key")
/**
* 任务Key
*/
private String taskDefKey;
@ApiModelProperty("任务执行人Id")
/**
* 任务执行人Id
*/
private Long assigneeId;
@ApiModelProperty("部门名称")
/**
* 部门名称
*/
private String deptName;
@ApiModelProperty("流程发起人部门名称")
/**
* 流程发起人部门名称
*/
private String startDeptName;
@ApiModelProperty("任务执行人名称")
/**
* 任务执行人名称
*/
private String assigneeName;
@ApiModelProperty("流程发起人Id")
/**
* 流程发起人Id
*/
private String startUserId;
@ApiModelProperty("流程发起人名称")
/**
* 流程发起人名称
*/
private String startUserName;
@ApiModelProperty("流程类型")
/**
* 流程类型
*/
private String category;
@ApiModelProperty("流程变量信息")
/**
* 流程变量信息
*/
private Object procVars;
@ApiModelProperty("局部变量信息")
/**
* 局部变量信息
*/
private Object taskLocalVars;
@ApiModelProperty("流程部署编号")
/**
* 流程部署编号
*/
private String deployId;
@ApiModelProperty("流程ID")
/**
* 流程ID
*/
private String procDefId;
@ApiModelProperty("流程key")
/**
* 流程key
*/
private String procDefKey;
@ApiModelProperty("流程定义名称")
/**
* 流程定义名称
*/
private String procDefName;
@ApiModelProperty("流程定义内置使用版本")
/**
* 流程定义内置使用版本
*/
private int procDefVersion;
@ApiModelProperty("流程实例ID")
/**
* 流程实例ID
*/
private String procInsId;
@ApiModelProperty("历史流程实例ID")
/**
* 历史流程实例ID
*/
private String hisProcInsId;
@ApiModelProperty("任务耗时")
/**
* 任务耗时
*/
private String duration;
@ApiModelProperty("任务意见")
/**
* 任务意见
*/
private WfCommentDto comment;
@ApiModelProperty("任务意见")
/**
* 任务意见
*/
private List<Comment> commentList;
@ApiModelProperty("候选执行人")
/**
* 候选执行人
*/
private String candidate;
@ApiModelProperty("任务创建时间")
/**
* 任务创建时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
@ApiModelProperty("任务完成时间")
/**
* 任务完成时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date finishTime;

2
ruoyi-system/src/main/java/com/ruoyi/workflow/domain/vo/WfViewerVo.java
View File

@@ -1,7 +1,6 @@
package com.ruoyi.workflow.domain.vo;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import io.swagger.annotations.ApiModel;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@@ -17,7 +16,6 @@ import java.util.Set;
@Data
@NoArgsConstructor
@AllArgsConstructor
@ApiModel("任务追踪视图对象")
@ExcelIgnoreUnannotated
public class WfViewerVo {

3
ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfProcessServiceImpl.java
View File

@@ -8,7 +8,6 @@ import cn.hutool.core.io.IoUtil;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.google.common.collect.Lists;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysRole;
@@ -378,7 +377,7 @@ public class WfProcessServiceImpl extends FlowServiceFactory implements IWfProce
.desc();
int offset = pageQuery.getPageSize() * (pageQuery.getPageNum() - 1);
List<HistoricTaskInstance> historicTaskInstanceList = taskInstanceQuery.listPage(offset, pageQuery.getPageSize());
List<WfTaskVo> hisTaskList = Lists.newArrayList();
List<WfTaskVo> hisTaskList = new ArrayList<>();
for (HistoricTaskInstance histTask : historicTaskInstanceList) {
WfTaskVo flowTask = new WfTaskVo();
// 当前流程信息