From d55278560d29562b341aafa1652209a8aae0af33 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期四, 30 四月 2026 17:08:16 +0800
Subject: [PATCH] 计量器具台账附件修改
---
src/main/java/com/ruoyi/inspectiontask/pojo/InspectionTask.java | 65 ++++++++++++++++++++------------
1 files changed, 40 insertions(+), 25 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..c41d626 100644
--- a/src/main/java/com/ruoyi/inspectiontask/pojo/InspectionTask.java
+++ b/src/main/java/com/ruoyi/inspectiontask/pojo/InspectionTask.java
@@ -2,8 +2,8 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -14,7 +14,7 @@
* @date : 2025/9/19 10:25
*/
@Data
-@ApiModel
+@Schema
@TableName("inspection_task")
public class InspectionTask {
@@ -26,56 +26,71 @@
@TableId(type = IdType.AUTO)
private Long id;
- @ApiModelProperty(value = "宸℃浠诲姟鍚嶇О")
+ @Schema(description = "璁惧鍚嶇О")
+ @Excel(name = "宸℃浠诲姟鍚嶇О")
private String taskName;
- @ApiModelProperty(value = "宸℃浜篒D")
+ @Schema(description = "璁惧id")
+ private Integer taskId;
+
+ @Schema(description = "宸℃浜篒D")
private String inspectorId;
- @ApiModelProperty(value = "鎵ц宸℃鐨勪汉鍛樺鍚�")
+ @Schema(description = "鎵ц宸℃鐨勪汉鍛樺鍚�")
+ @Excel(name = "鎵ц宸℃浜哄憳")
private String inspector;
- @ApiModelProperty(value = "浠诲姟闄勫姞璇存槑鎴栫壒娈婃儏鍐佃褰�")
+ @Schema(description = "浠诲姟闄勫姞璇存槑鎴栫壒娈婃儏鍐佃褰�")
+ @Excel(name = "澶囨敞")
private String remarks;
- @ApiModelProperty(value = "浠诲姟鐧昏浜篒D")
+ @Schema(description = "浠诲姟鐧昏浜篒D")
private Long registrantId;
- @ApiModelProperty(value = "浠诲姟鐧昏浜哄鍚�")
+ @Schema(description = "浠诲姟鐧昏浜哄鍚�")
+ @Excel(name = "鐧昏浜�")
private String registrant;
- @ApiModelProperty(value = "棰戞")
+ @Schema(description = "棰戞")
+ @Excel(name = "棰戞")
private String frequencyType;
- @ApiModelProperty(value = "鏃堕棿缁嗚妭")
+ @Schema(description = "鏃堕棿缁嗚妭")
+ @Excel(name = "寮�濮嬫棩鏈熶笌鏃堕棿")
private String frequencyDetail;
- @ApiModelProperty(value = "宸℃鍦扮偣璇︾粏鎻忚堪")
+ @Schema(description = "宸℃鍦扮偣璇︾粏鎻忚堪")
private String inspectionLocation;
- @ApiModelProperty(value = "杞垹闄ゆ爣蹇楋紝0=鏈垹闄わ紝1=宸插垹闄�")
+ @Schema(description = "杞垹闄ゆ爣蹇楋紝0=鏈垹闄わ紝1=宸插垹闄�")
private Integer deleted;
- @ApiModelProperty(value = "鍒涘缓璇ヨ褰曠殑鐢ㄦ埛")
- @TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT)
- private String createUser;
+ @Schema(description = "鍒涘缓璇ヨ褰曠殑鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
- @ApiModelProperty(value = "璁板綍鍒涘缓鏃堕棿")
- @TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT)
+ @Schema(description = "璁板綍鍒涘缓鏃堕棿")
+ @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;
+ @Schema(description = "鏈�鍚庝慨鏀硅璁板綍鐨勭敤鎴�")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Integer updateUser;
- @ApiModelProperty(value = "璁板綍鏈�鍚庢洿鏂版椂闂�")
- @TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT_UPDATE)
+ @Schema(description = "璁板綍鏈�鍚庢洿鏂版椂闂�")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty(value = "绉熸埛")
+ @Schema(description = "绉熸埛")
@TableField(fill = FieldFill.INSERT)
- private Integer tenantId;
+ private Long tenantId;
+ @TableField(exist = false)
+ private String dateStr;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
--
Gitblit v1.9.3