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/DeviceRepair.java | 38 +++++++++++++++++++++++++++++++-------
1 files changed, 31 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java b/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java
index b493cd4..67148e1 100644
--- a/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java
+++ b/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java
@@ -4,16 +4,15 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import nonapi.io.github.classgraph.json.Id;
import org.springframework.format.annotation.DateTimeFormat;
-import java.math.BigDecimal;
-import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.Date;
+import java.util.List;
+
+import com.ruoyi.measuringinstrumentledger.dto.SparePartsUseDto;
@Data
@TableName("device_repair")
@@ -23,13 +22,28 @@
private Long id;
@ApiModelProperty("璁惧鍙拌处id")
- private String deviceLedgerId;
+ private Long deviceLedgerId;
+
+ private String deviceName;
+
+ private String deviceModel;
@ApiModelProperty("鎶ヤ慨鏃堕棿")
private Date repairTime;
@ApiModelProperty("鎶ヤ慨浜�")
private String repairName;
+
+ @ApiModelProperty("楠屾敹浜�")
+ private String acceptanceName;
+
+ @ApiModelProperty("楠屾敹鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime acceptanceTime;
+
+ @ApiModelProperty("楠屾敹澶囨敞")
+ private String acceptanceRemark;
@ApiModelProperty("鎶ヤ慨鍐呭")
private String remark;
@@ -38,12 +52,14 @@
private String maintenanceName;
@ApiModelProperty("缁翠慨鏃堕棿")
- private Date maintenanceTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime maintenanceTime;
@ApiModelProperty("缁翠慨缁撴灉")
private String maintenanceResult;
- @ApiModelProperty("鐘舵�� 0 寰呯淮淇� 1瀹岀粨")
+ @ApiModelProperty("鐘舵�� 0寰呯淮淇� 1瀹屾垚 2缁翠慨澶辫触 3寰呴獙鏀�")
private Integer status;
@ApiModelProperty("鍒涘缓鏃堕棿")
@@ -70,5 +86,13 @@
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+ @ApiModelProperty("澶囦欢ID闆嗗悎锛堥�楀彿鍒嗛殧锛�")
+ @TableField(exist = false)
+ private String sparePartsIds;
+
+ @ApiModelProperty("澶囦欢棰嗙敤鏄庣粏")
+ @TableField(exist = false)
+ private List<SparePartsUseDto> sparePartsUseList;
+
}
--
Gitblit v1.9.3