ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 流程节点绑定审批人

Browse Source
This commit is contained in:
lijiarao
2023-10-16 15:35:59 +08:00
parent 2410acf525
commit 658a3d7656
31 changed files with 548 additions and 508 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/entity/ProcessModelNode.java
+17 -3
View File
@@ -12,13 +12,13 @@ import lombok.Data;
/**
*
*@author liJiaRao
*@date 2023-10-08 18:01
*@date 2023-10-16 10:09
*/
/**
* 流程节点加签表
* 流程模型节点表
*/
@ApiModel(description = "流程节点加签表")
@ApiModel(description = "流程模型节点表")
@Data
@TableName(value = "process_model_node")
public class ProcessModelNode {
@@ -78,6 +78,20 @@ public class ProcessModelNode {
@ApiModelProperty(value = "xml目标节点id")
private String xmlTargetRef;
/**
* 变量类型
*/
@TableField(value = "variable_type")
@ApiModelProperty(value = "变量类型")
private String variableType;
/**
* 变量名称
*/
@TableField(value = "variable_name")
@ApiModelProperty(value = "变量名称")
private String variableName;
/**
* 是否审批节点
*/
laws-modules/src/main/java/com/jero/modules/activiti/entity/ProcessNode.java
+14 -8
View File
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.jero.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.util.Date;
@@ -40,18 +41,18 @@ public class ProcessNode {
private String nodeName;
/**
* 是否审批节点
* 变量类型
*/
@TableField(value = "is_approval_node")
@ApiModelProperty(value = "是否审批节点")
private Integer isApprovalNode;
@TableField(value = "variable_type")
@ApiModelProperty(value = "变量类型")
private String variableType;
/**
* 是否可删除
* 变量名称
*/
@TableField(value = "is_can_deleted")
@ApiModelProperty(value = "是否可删除")
private Integer isCanDeleted;
@TableField(value = "variable_name")
@ApiModelProperty(value = "变量名称")
private String variableName;
/**
* 排序
@@ -94,4 +95,9 @@ public class ProcessNode {
@TableField(value = "sys_code")
@ApiModelProperty(value = "所属部门")
private String sysCode;
@TableField(exist = false)
@ApiModelProperty(value = "关联用户id")
@Dict(dictTable = "sys_user",dicText = "realname",dicCode = "id")
private String linkUserIds;
}
laws-modules/src/main/java/com/jero/modules/activiti/entity/ProcessNodeLink.java
+22 -11
View File
@@ -9,11 +9,15 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
*流程节点关联用户部门表
*
*@author liJiaRao
*@date 2023-09-26 15:12
*@date 2023-10-16 13:43
*/
@ApiModel(description = "流程节点关联用户部门表")
/**
* 流程实例节点关联用户表
*/
@ApiModel(description = "流程实例节点关联用户表")
@Data
@TableName(value = "process_node_link")
public class ProcessNodeLink {
@@ -24,6 +28,13 @@ public class ProcessNodeLink {
@ApiModelProperty(value = "主键id")
private String id;
/**
* 流程定义id
*/
@TableField(value = "process_definition_id")
@ApiModelProperty(value = "流程定义id")
private String processDefinitionId;
/**
* 流程节点id
*/
@@ -32,16 +43,16 @@ public class ProcessNodeLink {
private String processNodeId;
/**
* 类型（1-用户、2-部门）
* 流程实例id
*/
@TableField(value = "`type`")
@ApiModelProperty(value = "类型（1-用户、2-部门）")
private Integer type;
@TableField(value = "process_instance_id")
@ApiModelProperty(value = "流程实例id")
private String processInstanceId;
/**
* 用户id,部门id）
* 用户id
*/
@TableField(value = "user_depart_id")
@ApiModelProperty(value = "用户id,部门id）")
private String userDepartId;
@TableField(value = "user_id")
@ApiModelProperty(value = "用户id")
private String userId;
}
laws-modules/src/main/java/com/jero/modules/activiti/entity/ProcessNodeOrigin.java
-125
View File
@@ -1,125 +0,0 @@
package com.jero.modules.activiti.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.util.Date;
import lombok.Data;
/**
*流程节点_来源
*@author liJiaRao
*@date 2023-09-26 15:12
*/
@ApiModel(description = "流程节点_来源")
@Data
@TableName(value = "process_node_origin")
public class ProcessNodeOrigin {
/**
* 主键id
*/
@TableId(value = "id", type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "主键id")
private String id;
/**
* 流程定义id
*/
@TableField(value = "process_definition_id")
@ApiModelProperty(value = "流程定义id")
private String processDefinitionId;
/**
* 节点名称
*/
@TableField(value = "node_name")
@ApiModelProperty(value = "节点名称")
private String nodeName;
/**
* 节点类型
*/
@TableField(value = "node_type")
@ApiModelProperty(value = "节点类型")
private String nodeType;
/**
* xml节点Id
*/
@TableField(value = "xml_node_id")
@ApiModelProperty(value = "xml节点Id")
private String xmlNodeId;
/**
* xml来源节点id
*/
@TableField(value = "xml_source_ref")
@ApiModelProperty(value = "xml来源节点id")
private String xmlSourceRef;
/**
* xml目标节点id
*/
@TableField(value = "xml_target_ref")
@ApiModelProperty(value = "xml目标节点id")
private String xmlTargetRef;
/**
* 是否审批节点
*/
@TableField(value = "is_approval_node")
@ApiModelProperty(value = "是否审批节点")
private Integer isApprovalNode;
/**
* 是否可删除
*/
@TableField(value = "is_can_deleted")
@ApiModelProperty(value = "是否可删除")
private Integer isCanDeleted;
/**
* 排序
*/
@TableField(value = "sort")
@ApiModelProperty(value = "排序")
private Integer sort;
/**
* 创建人
*/
@TableField(value = "create_by")
@ApiModelProperty(value = "创建人")
private String createBy;
/**
* 创建时间
*/
@TableField(value = "create_time")
@ApiModelProperty(value = "创建时间")
private Date createTime;
/**
* 更新人
*/
@TableField(value = "update_by")
@ApiModelProperty(value = "更新人")
private String updateBy;
/**
* 更新时间
*/
@TableField(value = "update_time")
@ApiModelProperty(value = "更新时间")
private Date updateTime;
/**
* 所属部门
*/
@TableField(value = "sys_code")
@ApiModelProperty(value = "所属部门")
private String sysCode;
}