From 6bab142343375e744e46f2042aa3b0fedea70b06 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 19 五月 2026 23:32:55 +0800
Subject: [PATCH] fix: 设备巡检修改
---
src/main/java/com/ruoyi/inspectiontask/pojo/InspectionTask.java | 45 +++++++++++++++++++++++++++++++++++++--------
1 files changed, 37 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/inspectiontask/pojo/InspectionTask.java b/src/main/java/com/ruoyi/inspectiontask/pojo/InspectionTask.java
index 74fd9d2..84e4608 100644
--- a/src/main/java/com/ruoyi/inspectiontask/pojo/InspectionTask.java
+++ b/src/main/java/com/ruoyi/inspectiontask/pojo/InspectionTask.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -26,29 +27,45 @@
@TableId(type = IdType.AUTO)
private Long id;
- @ApiModelProperty(value = "宸℃浠诲姟鍚嶇О")
+ @ApiModelProperty(value = "璁惧鍚嶇О")
+ @Excel(name = "宸℃浠诲姟鍚嶇О")
private String taskName;
+
+ @ApiModelProperty(value = "璁惧id")
+ private Integer taskId;
@ApiModelProperty(value = "宸℃浜篒D")
private String inspectorId;
@ApiModelProperty(value = "鎵ц宸℃鐨勪汉鍛樺鍚�")
+ @Excel(name = "鎵ц宸℃浜哄憳")
private String inspector;
@ApiModelProperty(value = "浠诲姟闄勫姞璇存槑鎴栫壒娈婃儏鍐佃褰�")
+ @Excel(name = "澶囨敞")
private String remarks;
@ApiModelProperty(value = "浠诲姟鐧昏浜篒D")
private Long registrantId;
@ApiModelProperty(value = "浠诲姟鐧昏浜哄鍚�")
+ @Excel(name = "鐧昏浜�")
private String registrant;
@ApiModelProperty(value = "棰戞")
+ @Excel(name = "棰戞")
private String frequencyType;
@ApiModelProperty(value = "鏃堕棿缁嗚妭")
+ @Excel(name = "寮�濮嬫棩鏈熶笌鏃堕棿")
private String frequencyDetail;
+
+ @ApiModelProperty(value = "宸℃鐘舵��: 0=鏈贰妫�, 1=姝ｅ父, 2=寮傚父")
+ private Integer inspectionStatus;
+
+ @ApiModelProperty(value = "宸℃寮傚父鎻忚堪")
+ @Excel(name = "寮傚父鎻忚堪")
+ private String inspectionRemark;
@ApiModelProperty(value = "宸℃鍦扮偣璇︾粏鎻忚堪")
private String inspectionLocation;
@@ -57,25 +74,37 @@
private Integer deleted;
@ApiModelProperty(value = "鍒涘缓璇ヨ褰曠殑鐢ㄦ埛")
- @TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT)
- private String createUser;
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
@ApiModelProperty(value = "璁板綍鍒涘缓鏃堕棿")
- @TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT)
+ @TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "鐧昏鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
@ApiModelProperty(value = "鏈�鍚庝慨鏀硅璁板綍鐨勭敤鎴�")
- @TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT_UPDATE)
- private String updateUser;
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Integer updateUser;
@ApiModelProperty(value = "璁板綍鏈�鍚庢洿鏂版椂闂�")
- @TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT_UPDATE)
+ @TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
@ApiModelProperty(value = "绉熸埛")
@TableField(fill = FieldFill.INSERT)
- private Integer tenantId;
+ private Long tenantId;
+ @ApiModelProperty(value = "宸℃楠屾敹浜篒D")
+ private Long inspectionAcceptorId;
+
+ @ApiModelProperty(value = "宸℃楠屾敹浜哄鍚�")
+ private String inspectionAcceptor;
+
+ @ApiModelProperty(value = "楠屾敹鐘舵��: 0=寰呴獙鏀�, 1=宸查�氳繃, 2=宸查��鍥�")
+ private Integer acceptStatus;
+
+ @TableField(exist = false)
+ private String dateStr;
}
--
Gitblit v1.9.3