!6 同步develop分支

* sync -- 同步develop分支

ruoyi-system/src/main/java/com/ruoyi/workflow/domain/FlowCategory.java

@@ -0,0 +1,46 @@
+package com.ruoyi.workflow.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 流程分类对象 workflow_category
+ *
+ * @author KonBAI
+ * @date 2022-01-15
+ */
+@Data
+@Accessors(chain = true)
+@TableName("workflow_category")
+public class FlowCategory extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 分类ID
+     */
+    @TableId(value = "category_id")
+    private Long categoryId;
+    /**
+     * 分类名称
+     */
+    private String categoryName;
+    /**
+     * 分类编码
+     */
+    private String code;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
+    @TableLogic
+    private String delFlag;
+
+}

ruoyi-system/src/main/java/com/ruoyi/workflow/domain/bo/FlowCategoryBo.java

@@ -0,0 +1,55 @@
+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;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * 流程分类业务对象 flow_category
+ *
+ * @author KonBAI
+ * @date 2022-01-15
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("流程分类业务对象")
+public class FlowCategoryBo 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;
+
+
+}

ruoyi-system/src/main/java/com/ruoyi/workflow/domain/dto/FlowCommentDto.java

@@ -0,0 +1,25 @@
+package com.ruoyi.workflow.domain.dto;
+
+import lombok.Builder;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author XuanXuan
+ * @date 2021/3/28 15:50
+ */
+@Data
+@Builder
+public class FlowCommentDto implements Serializable {
+
+    /**
+     * 意见类别 0 正常意见  1 退回意见 2 驳回意见
+     */
+    private String type;
+
+    /**
+     * 意见内容
+     */
+    private String comment;
+}

ruoyi-system/src/main/java/com/ruoyi/workflow/domain/dto/FlowFromFieldDTO.java

@@ -0,0 +1,15 @@
+package com.ruoyi.workflow.domain.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author XuanXuan
+ * @date 2021/3/31 23:20
+ */
+@Data
+public class FlowFromFieldDTO implements Serializable {
+
+    private Object fields;
+}

ruoyi-system/src/main/java/com/ruoyi/workflow/domain/dto/FlowNextDto.java

@@ -0,0 +1,25 @@
+package com.ruoyi.workflow.domain.dto;
+
+import com.ruoyi.common.core.domain.entity.SysRole;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 动态人员、组
+ * @author Xuan xuan
+ * @date 2021/4/17 22:59
+ */
+@Data
+public class FlowNextDto implements Serializable {
+
+    private String type;
+
+    private String vars;
+
+    private List<SysUser> userList;
+
+    private List<SysRole> roleList;
+}

ruoyi-system/src/main/java/com/ruoyi/workflow/domain/dto/FlowProcDefDto.java

@@ -0,0 +1,56 @@
+package com.ruoyi.workflow.domain.dto;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>流程定义<p>
+ *
+ * @author XuanXuan
+ * @date 2021-04-03
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel("流程定义")
+public class FlowProcDefDto implements Serializable {
+
+    @ApiModelProperty("流程id")
+    private String id;
+
+    @ApiModelProperty("流程名称")
+    private String name;
+
+    @ApiModelProperty("流程key")
+    private String key;
+
+    @ApiModelProperty("流程分类")
+    private String category;
+
+    @ApiModelProperty("配置表单名称")
+    private String formName;
+
+    @ApiModelProperty("配置表单id")
+    private Long formId;
+
+    @ApiModelProperty("版本")
+    private int version;
+
+    @ApiModelProperty("部署ID")
+    private String deploymentId;
+
+    @ApiModelProperty("流程定义状态: 1:激活 , 2:中止")
+    private int suspensionState;
+
+    @ApiModelProperty("部署时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date deploymentTime;
+
+
+}

ruoyi-system/src/main/java/com/ruoyi/workflow/domain/dto/FlowSaveXmlVo.java

@@ -0,0 +1,28 @@
+package com.ruoyi.workflow.domain.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author XuanXuan
+ * @date 2021/3/28 19:48
+ */
+@Data
+public class FlowSaveXmlVo implements Serializable {
+
+    /**
+     * 流程名称
+     */
+    private String name;
+
+    /**
+     * 流程分类
+     */
+    private String category;
+
+    /**
+     * xml 文件
+     */
+    private String xml;
+}

ruoyi-system/src/main/java/com/ruoyi/workflow/domain/dto/FlowTaskDto.java

@@ -0,0 +1,97 @@
+package com.ruoyi.workflow.domain.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>工作流任务<p>
+ *
+ * @author XuanXuan
+ * @date 2021-04-03
+ */
+@Getter
+@Setter
+@ApiModel("工作流任务相关-返回参数")
+public class FlowTaskDto implements Serializable {
+
+    @ApiModelProperty("任务编号")
+    private String taskId;
+
+    @ApiModelProperty("任务名称")
+    private String taskName;
+
+    @ApiModelProperty("任务Key")
+    private String taskDefKey;
+
+    @ApiModelProperty("任务执行人Id")
+    private Long assigneeId;
+
+    @ApiModelProperty("部门名称")
+    private String deptName;
+
+    @ApiModelProperty("流程发起人部门名称")
+    private String startDeptName;
+
+    @ApiModelProperty("任务执行人名称")
+    private String assigneeName;
+
+    @ApiModelProperty("流程发起人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")
+    private String procDefId;
+
+    @ApiModelProperty("流程key")
+    private String procDefKey;
+
+    @ApiModelProperty("流程定义名称")
+    private String procDefName;
+
+    @ApiModelProperty("流程定义内置使用版本")
+    private int procDefVersion;
+
+    @ApiModelProperty("流程实例ID")
+    private String procInsId;
+
+    @ApiModelProperty("历史流程实例ID")
+    private String hisProcInsId;
+
+    @ApiModelProperty("任务耗时")
+    private String duration;
+
+    @ApiModelProperty("任务意见")
+    private FlowCommentDto comment;
+
+    @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;
+
+}

ruoyi-system/src/main/java/com/ruoyi/workflow/domain/dto/FlowViewerDto.java

@@ -0,0 +1,16 @@
+package com.ruoyi.workflow.domain.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author Xuan xuan
+ * @date 2021/4/21 20:55
+ */
+@Data
+public class FlowViewerDto implements Serializable {
+
+    private String key;
+    private boolean completed;
+}

ruoyi-system/src/main/java/com/ruoyi/workflow/domain/vo/FlowCategoryVo.java

@@ -0,0 +1,53 @@
+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;
+
+
+
+/**
+ * 流程分类视图对象 flow_category
+ *
+ * @author KonBAI
+ * @date 2022-01-15
+ */
+@Data
+@ApiModel("流程分类视图对象")
+@ExcelIgnoreUnannotated
+public class FlowCategoryVo {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 分类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;
+
+
+}

ruoyi-system/src/main/java/com/ruoyi/workflow/domain/vo/FlowTaskVo.java

@@ -0,0 +1,46 @@
+package com.ruoyi.workflow.domain.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>流程任务<p>
+ *
+ * @author XuanXuan
+ * @date 2021-04-03
+ */
+@Data
+@ApiModel("工作流任务相关--请求参数")
+public class FlowTaskVo {
+
+    @ApiModelProperty("任务Id")
+    private String taskId;
+
+    @ApiModelProperty("用户Id")
+    private String userId;
+
+    @ApiModelProperty("任务意见")
+    private String comment;
+
+    @ApiModelProperty("流程实例Id")
+    private String instanceId;
+
+    @ApiModelProperty("节点")
+    private String targetKey;
+
+    @ApiModelProperty("流程变量信息")
+    private Map<String, Object> values;
+
+    @ApiModelProperty("审批人")
+    private String assignee;
+
+    @ApiModelProperty("候选人")
+    private List<String> candidateUsers;
+
+    @ApiModelProperty("审批组")
+    private List<String> candidateGroups;
+}

ruoyi-system/src/main/java/com/ruoyi/workflow/domain/vo/FlowViewerVo.java

@@ -0,0 +1,30 @@
+package com.ruoyi.workflow.domain.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+import java.util.Set;
+
+/**
+ * 任务追踪视图类
+ *
+ * @author konbai
+ * @createTime 2022/1/8 19:42
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class FlowViewerVo {
+
+    /**
+     * 获取流程实例的历史节点（去重）
+     */
+    private List<String> finishedTaskList;
+
+    /**
+     * 获取流程实例当前正在待办的节点（去重）
+     */
+    private List<String> unfinishedTaskList;
+}