From b871e526e794c09708de431899ef6de75886bbc4 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 20 十月 2026 15:22:32 +0800
Subject: [PATCH] feat: 设备巡检优化,巡检项目拆分
---
src/main/java/com/ruoyi/inspectiontask/pojo/TimingTask.java | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/inspectiontask/pojo/TimingTask.java b/src/main/java/com/ruoyi/inspectiontask/pojo/TimingTask.java
index 2d8722e..6c0f312 100644
--- a/src/main/java/com/ruoyi/inspectiontask/pojo/TimingTask.java
+++ b/src/main/java/com/ruoyi/inspectiontask/pojo/TimingTask.java
@@ -11,6 +11,7 @@
import java.time.LocalDate;
import java.time.LocalDateTime;
+import java.util.List;
/**
* @author :yys
@@ -36,6 +37,15 @@
@Schema(description = "璁惧id")
private Integer taskId;
+ @TableField(exist = false)
+ private List<Long> inspectionItemIds;
+
+ @TableField(exist = false)
+ private List<TimingTaskItem> inspectionItems;
+
+ @TableField(exist = false)
+ private List<TimingTaskItem> customItems;
+
@Schema(description = "宸℃浜�")
@Excel(name = "鎵ц宸℃浜�")
private String inspectorIds;
@@ -59,6 +69,10 @@
@Schema(description = "鏄惁婵�娲�")
private boolean isActive;
+
+ @Schema(description = "鏄惁鍚敤 0鍚� 1鏄�")
+ @Excel(name = "鏄惁鍚敤", readConverterExp = "0=鍚�,1=鏄�")
+ private Integer isEnabled;
@Schema(description = "澶囨敞")
@Excel(name = "澶囨敞")
@@ -85,17 +99,17 @@
private String dateStr;
@Schema(description = "鍒涘缓璇ヨ褰曠殑鐢ㄦ埛")
- @TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT)
+ @TableField(fill = FieldFill.INSERT)
private Integer createUser;
@Schema(description = "璁板綍鍒涘缓鏃堕棿")
- @TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT)
+ @TableField(fill = FieldFill.INSERT)
// @JsonFormat(pattern = "yyyy-MM-dd")
// @DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDateTime createTime;
@Schema(description = "鏈�鍚庝慨鏀硅璁板綍鐨勭敤鎴�")
- @TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT_UPDATE)
+ @TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
@Schema(description = "璁板綍鏈�鍚庢洿鏂版椂闂�")
@@ -103,7 +117,7 @@
private LocalDateTime updateTime;
@Schema(description = "绉熸埛ID")
- @TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT)
+ @TableField(fill = FieldFill.INSERT)
private Long tenantId;
--
Gitblit v1.9.3