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

add -- 新增流程审核可选择抄送流程功能

Browse Source
This commit is contained in:
konbai
2022-05-29 18:10:18 +08:00
parent ab1c50ca06
commit 64eb962366
13 changed files with 863 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
ruoyi-system/src/main/java/com/ruoyi/workflow/domain/WfCopy.java Normal file
View File

@@ -0,0 +1,74 @@
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.EqualsAndHashCode;
/**
* 流程抄送对象 wf_copy
*
* @author KonBAI
* @date 2022-05-19
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("wf_copy")
public class WfCopy extends BaseEntity {
private static final long serialVersionUID=1L;
/**
* 抄送主键
*/
@TableId(value = "copy_id")
private Long copyId;
/**
* 抄送标题
*/
private String title;
/**
* 流程主键
*/
private String processId;
/**
* 流程名称
*/
private String processName;
/**
* 流程分类主键
*/
private String categoryId;
/**
* 部署主键
*/
private String deploymentId;
/**
* 流程实例主键
*/
private String instanceId;
/**
* 任务主键
*/
private String taskId;
/**
* 用户主键
*/
private Long userId;
/**
* 发起人Id
*/
private Long originatorId;
/**
* 发起人名称
*/
private String originatorName;
/**
* 删除标志（0代表存在 2代表删除）
*/
@TableLogic
private String delFlag;
}

87
ruoyi-system/src/main/java/com/ruoyi/workflow/domain/bo/WfCopyBo.java Normal file
View File

@@ -0,0 +1,87 @@
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;
/**
* 流程抄送业务对象 wf_copy
*
* @author ruoyi
* @date 2022-05-19
*/
@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/WfTaskBo.java
View File

@@ -20,6 +20,9 @@ public class WfTaskBo {
@ApiModelProperty("任务Id")
private String taskId;
@ApiModelProperty("任务名称")
private String taskName;
@ApiModelProperty("用户Id")
private String userId;
@@ -43,4 +46,7 @@ public class WfTaskBo {
@ApiModelProperty("审批组")
private List<String> candidateGroups;
@ApiModelProperty("抄送用户Id")
private String copyUserIds;
}

108
ruoyi-system/src/main/java/com/ruoyi/workflow/domain/vo/WfCopyVo.java Normal file
View File

@@ -0,0 +1,108 @@
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;
/**
* 流程抄送视图对象 wf_copy
*
* @author ruoyi
* @date 2022-05-19
*/
@Data
@ApiModel("流程抄送视图对象")
@ExcelIgnoreUnannotated
public class WfCopyVo {
private static final long serialVersionUID = 1L;
/**
* 抄送主键
*/
@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;
}