From b7ec3aff011f05e236e76be844540dbe776f7353 Mon Sep 17 00:00:00 2001 From: xuhy <3313886187@qq.com> Date: 星期五, 27 六月 2025 19:12:03 +0800 Subject: [PATCH] bug修改 --- ruoyi-system/src/main/java/com/ruoyi/system/model/TSamplingRecord.java | 25 ++++++++++++++++++++++--- 1 files changed, 22 insertions(+), 3 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TSamplingRecord.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TSamplingRecord.java index 131ced6..d474901 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TSamplingRecord.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TSamplingRecord.java @@ -1,13 +1,16 @@ package com.ruoyi.system.model; -import com.baomidou.mybatisplus.annotation.*; +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.fasterxml.jackson.annotation.JsonFormat; 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; /** @@ -41,8 +44,24 @@ @TableField("remark") private String remark; - @ApiModelProperty(value = "状态 -1=草稿箱 1=已发送 2=已封存") + @ApiModelProperty(value = "状态 -1=草稿箱 1=已发送待提交 2=已提交 3=已封存") @TableField("status") private Integer status; + @ApiModelProperty(value = "提交人") + @TableField("commit_person_id") + private Long commitPersonId; + + @ApiModelProperty(value = "提交人签字") + @TableField("commit_sign") + private String commitSign; + + @ApiModelProperty(value = "提交时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @TableField("commit_time") + private LocalDateTime commitTime; + + @ApiModelProperty(value = "历史状态") + @TableField("old_status") + private Integer oldStatus; } -- Gitblit v1.7.1