From 9e713fac3f6186b735c484bed5b2c1652467bed1 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 20 十月 2026 15:31:40 +0800
Subject: [PATCH] Revert "feat: 设备巡检优化,巡检项目拆分"
---
src/main/java/com/ruoyi/inspectiontask/pojo/TimingTask.java | 22 ++++++++--------------
1 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/ruoyi/inspectiontask/pojo/TimingTask.java b/src/main/java/com/ruoyi/inspectiontask/pojo/TimingTask.java
index 6c0f312..43a3edc 100644
--- a/src/main/java/com/ruoyi/inspectiontask/pojo/TimingTask.java
+++ b/src/main/java/com/ruoyi/inspectiontask/pojo/TimingTask.java
@@ -11,7 +11,6 @@
import java.time.LocalDate;
import java.time.LocalDateTime;
-import java.util.List;
/**
* @author :yys
@@ -34,17 +33,12 @@
@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 = "鎵ц宸℃浜�")
@@ -99,17 +93,17 @@
private String dateStr;
@Schema(description = "鍒涘缓璇ヨ褰曠殑鐢ㄦ埛")
- @TableField(fill = FieldFill.INSERT)
+ @TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT)
private Integer createUser;
@Schema(description = "璁板綍鍒涘缓鏃堕棿")
- @TableField(fill = FieldFill.INSERT)
+ @TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT)
// @JsonFormat(pattern = "yyyy-MM-dd")
// @DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDateTime createTime;
@Schema(description = "鏈�鍚庝慨鏀硅璁板綍鐨勭敤鎴�")
- @TableField(fill = FieldFill.INSERT_UPDATE)
+ @TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT_UPDATE)
private Integer updateUser;
@Schema(description = "璁板綍鏈�鍚庢洿鏂版椂闂�")
@@ -117,7 +111,7 @@
private LocalDateTime updateTime;
@Schema(description = "绉熸埛ID")
- @TableField(fill = FieldFill.INSERT)
+ @TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT)
private Long tenantId;
--
Gitblit v1.9.3