From f086c57f64ff30b719d0fd51cbb62a2e5d0240aa Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 20 十月 2026 14:00:26 +0800
Subject: [PATCH] chore: 和鑫电器配置文件
---
src/main/java/com/ruoyi/device/pojo/MaintenanceTask.java | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/pojo/MaintenanceTask.java b/src/main/java/com/ruoyi/device/pojo/MaintenanceTask.java
index 0edfc7b..14fe4b7 100644
--- a/src/main/java/com/ruoyi/device/pojo/MaintenanceTask.java
+++ b/src/main/java/com/ruoyi/device/pojo/MaintenanceTask.java
@@ -13,6 +13,7 @@
import java.time.LocalDate;
import java.time.LocalDateTime;
+import java.util.List;
/**
* @author :yys
@@ -28,6 +29,9 @@
@Schema(description = "瑙勬牸鍨嬪彿")
private String deviceModel;
+ @Schema(description = "璁惧椤圭洰")
+ private String machineryCategory;
+
/**
* 涓婚敭ID
*/
@@ -40,6 +44,10 @@
@Schema(description = "璁惧id")
private Long taskId;
+
+ @Schema(description = "淇濆吇浜�")
+ @Excel(name = "淇濆吇浜�")
+ private String maintenancePerson;
@Schema(description = "棰戞")
@Excel(name = "棰戞")
@@ -55,8 +63,8 @@
@Schema(description = "鏈�鍚庢墽琛屾椂闂�")
private LocalDateTime lastExecutionTime;
- @Schema(description = "鏄惁婵�娲�")
- private boolean isActive;
+ @Schema(description = "鏄惁婵�娲�, 1=鍚敤, 0=鍋滅敤")
+ private Integer isActive;
@Schema(description = "澶囨敞")
@Excel(name = "澶囨敞")
@@ -84,6 +92,15 @@
@TableField(exist = false)
private String dateStr;
+ @TableField(exist = false)
+ private List<Long> maintenanceItemIds;
+
+ @TableField(exist = false)
+ private List<MaintenanceTaskItem> customItems;
+
+ @TableField(exist = false)
+ private List<MaintenanceTaskItem> maintenanceItems;
+
@Schema(description = "鍒涘缓璇ヨ褰曠殑鐢ㄦ埛")
@TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT)
private Integer createUser;
--
Gitblit v1.9.3