From 5fa6e6f8410ef9d057174bcff2a3c5038c54a551 Mon Sep 17 00:00:00 2001 From: xuhy <3313886187@qq.com> Date: 星期日, 27 四月 2025 18:41:20 +0800 Subject: [PATCH] bug修改 --- ruoyi-system/src/main/java/com/ruoyi/system/model/StateProcessInstanceAction.java | 51 ++++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 46 insertions(+), 5 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/StateProcessInstanceAction.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/StateProcessInstanceAction.java index 2ae643c..0ed879b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/model/StateProcessInstanceAction.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/StateProcessInstanceAction.java @@ -1,24 +1,65 @@ package com.ruoyi.system.model; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.ruoyi.common.core.domain.BaseModel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; +import java.time.LocalDateTime; @Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "工作流-实例操作记录表") @TableName(value = "state_process_instance_action") -public class StateProcessInstanceAction extends BaseModel { +public class StateProcessInstanceAction implements Serializable { - @TableId(type = IdType.NONE) + @TableId(value = "id", type = IdType.ASSIGN_ID) private String id; + @ApiModelProperty(value = "流程实例id") + @TableField("instance_id") private String instanceId; + @ApiModelProperty(value = "抄送、自动审批:true") + @TableField("robot") private boolean robot; + @ApiModelProperty(value = "审批办理人id") + @TableField("auditor_id") private String auditorId; + @ApiModelProperty(value ="动作类型") + @TableField("action_type") private Integer actionType; + @ApiModelProperty(value = "抄送人") + @TableField("user_ids") private String userIds; + @ApiModelProperty(value = "分配人ID") + @TableField("assignee_id") private String assigneeId; + @ApiModelProperty(value = "节点ID") + @TableField("node_id") private String nodeId; + @ApiModelProperty(value = "备注") + @TableField("remark") private String remark; + @ApiModelProperty(value = "图片") + @TableField("pictures") + private String pictures; + /** + * 删除 未删除 + */ + @TableField("`disabled`") + @TableLogic + private Boolean disabled; + + @ApiModelProperty(value = "记录创建时间,前端忽略") + @TableField("create_time") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private LocalDateTime createTime; + + @TableField(exist = false) + private String nickName; } -- Gitblit v1.7.1