From b7080587bc00e5451aa8435f093f0d8cc6f80320 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 16 十月 2026 22:39:04 +0800
Subject: [PATCH] feat: 设备巡检优化,巡检项目拆分
---
src/main/java/com/ruoyi/inspectiontask/pojo/TimingTask.java | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/inspectiontask/pojo/TimingTask.java b/src/main/java/com/ruoyi/inspectiontask/pojo/TimingTask.java
index 43a3edc..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
@@ -33,12 +34,17 @@
@Excel(name = "宸℃浠诲姟鍚嶇О")
private String taskName;
- @Schema(description = "宸℃椤圭洰")
- @Excel(name = "宸℃椤圭洰")
- private String inspectionProject;
-
@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 = "鎵ц宸℃浜�")
@@ -93,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 = "璁板綍鏈�鍚庢洿鏂版椂闂�")
@@ -111,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