From 720e3c0e119ca062dc69aca47ec6c42254fee75d Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 03 七月 2025 21:17:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TInspector.java | 39 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 38 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TInspector.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TInspector.java
index 84c7ff7..70bef06 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TInspector.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TInspector.java
@@ -1,7 +1,9 @@
package com.ruoyi.system.model;
+import cn.afterturn.easypoi.excel.annotation.Excel;
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;
@@ -23,7 +25,7 @@
@EqualsAndHashCode(callSuper = false)
@TableName("t_inspector")
@ApiModel(value="TInspector对象", description="督察记录")
-public class TInspector extends BaseModel {
+public class TInspector implements Serializable {
private static final long serialVersionUID = 1L;
@@ -56,6 +58,7 @@
@ApiModelProperty(value = "状态1待确认 2待整改 3整改完成 4已完成")
@TableField("status")
+ @Excel(name = "执行状态", orderNum = "8", width = 20,replace = {"待确认","2_待整改","3_整改完成","4_已完成"})
private Integer status;
@ApiModelProperty(value = "审核人id")
@@ -65,6 +68,7 @@
@ApiModelProperty(value = "审核时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField("audit_time")
+
private LocalDateTime auditTime;
@ApiModelProperty(value = "审核状态1通过2驳回")
@@ -74,6 +78,39 @@
@ApiModelProperty(value = "审核备注")
@TableField("audit_remark")
private String auditRemark;
+ @ApiModelProperty(value = "提交人id")
+ @TableField("commit_person")
+ private String commitPerson;
+ @ApiModelProperty(value = "记录创建人，前端忽略")
+ @TableField(value = "create_by", fill = FieldFill.INSERT)
+ private String createBy;
+ /**
+ * 新增和更新执行
+ */
+ @ApiModelProperty(value = "记录修改人，前端忽略")
+ @TableField(value = "update_by", fill = FieldFill.INSERT_UPDATE)
+ private String updateBy;
+ /**
+ * 删除 未删除
+ */
+ @JsonIgnore
+ @TableField("`disabled`")
+ @TableLogic
+ private Boolean disabled;
+
+ @ApiModelProperty(value = "记录创建时间，前端忽略")
+ @TableField("create_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @Excel(name = "任务时间", orderNum = "9", width = 30, exportFormat = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime createTime;
+ /**
+ * 最后修改时间
+ */
+ @ApiModelProperty(value = "记录修改时间，前端忽略")
+ @TableField("update_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+
+ private LocalDateTime updateTime;
}
--
Gitblit v1.7.1