From 86379aae223a16fed59d46f915ade96ef987b8d2 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期日, 28 六月 2026 18:39:24 +0800
Subject: [PATCH] fix: 不合格预警设置为一个月
---
src/main/java/com/ruoyi/device/pojo/DeviceRepair.java | 32 +++++++++++++++++++++++++++-----
1 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java b/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java
index ebc2dea..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")
@@ -25,11 +24,26 @@
@ApiModelProperty("璁惧鍙拌处id")
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;
@@ -45,7 +59,7 @@
@ApiModelProperty("缁翠慨缁撴灉")
private String maintenanceResult;
- @ApiModelProperty("鐘舵�� 0 寰呯淮淇� 1瀹岀粨")
+ @ApiModelProperty("鐘舵�� 0寰呯淮淇� 1瀹屾垚 2缁翠慨澶辫触 3寰呴獙鏀�")
private Integer status;
@ApiModelProperty("鍒涘缓鏃堕棿")
@@ -72,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