From fbda2f16d63dcad15de13ab0997ef51257e5815b Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期五, 26 六月 2026 10:53:52 +0800
Subject: [PATCH] feat: 更新定时任务调度逻辑，支持启用状态下重新调度任务
---
src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java | 26 +++++++++++++++++++++++++-
1 files changed, 25 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java b/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java
index 91f8df3..00a1066 100644
--- a/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java
+++ b/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java
@@ -10,6 +10,9 @@
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
+import java.util.List;
+
+import com.ruoyi.measuringinstrumentledger.dto.SparePartsUseDto;
@Data
@TableName("device_maintenance")
@@ -50,6 +53,12 @@
@ApiModelProperty("瀹為檯淇濆吇浜�")
private String maintenanceActuallyName;
+ @ApiModelProperty("璁″垝淇濆吇浜篿d")
+ private Long maintenancePersonId;
+
+ @ApiModelProperty("璁″垝淇濆吇浜�")
+ private String maintenancePerson;
+
@ApiModelProperty("瀹為檯淇濆吇鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -85,6 +94,21 @@
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
- @ApiModelProperty("璁惧淇濆吇浣嶇疆")
+ @ApiModelProperty("淇濆吇閮ㄤ綅")
private String maintenanceLocation;
+
+ @ApiModelProperty("淇濆吇椤圭洰")
+ private String maintenanceItems;
+
+ @ApiModelProperty("涓存椂鏂囦欢ID鍒楄〃")
+ @TableField(exist = false)
+ private List<String> tempFileIds;
+
+ @ApiModelProperty("澶囦欢ID闆嗗悎锛堥�楀彿鍒嗛殧锛�")
+ @TableField(exist = false)
+ private String sparePartsIds;
+
+ @ApiModelProperty("澶囦欢棰嗙敤鏄庣粏")
+ @TableField(exist = false)
+ private List<SparePartsUseDto> sparePartsUseList;
}
--
Gitblit v1.9.3