From f57064d2fa563ee4cfeeccd715850ba8b8aa4f60 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 18 五月 2026 09:44:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_宁夏_英泽防锈

---
 src/main/java/com/ruoyi/device/pojo/DeviceRepair.java |   61 +++++++++++++++++++++++-------
 1 files changed, 46 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java b/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java
index a567366..c9efa55 100644
--- a/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java
+++ b/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java
@@ -4,73 +4,104 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.time.LocalDateTime;
 import java.util.Date;
+import java.util.List;
 
 @Data
 @TableName("device_repair")
 public class DeviceRepair {
 
-    @ApiModelProperty("璁惧鎶ヤ慨id")
+    @Schema(description = "璁惧鎶ヤ慨id")
     private Long id;
 
-    @ApiModelProperty("璁惧鍙拌处id")
+    @Schema(description = "璁惧鍙拌处id")
     private Long deviceLedgerId;
 
     private String deviceName;
 
     private String deviceModel;
 
-    @ApiModelProperty("鎶ヤ慨鏃堕棿")
+    @Schema(description = "鎶ヤ慨鏃堕棿")
     private Date repairTime;
 
-    @ApiModelProperty("鎶ヤ慨浜�")
+    @Schema(description = "鎶ヤ慨浜�")
     private String repairName;
 
-    @ApiModelProperty("鎶ヤ慨鍐呭")
+    @Schema(description = "鎶ヤ慨鍐呭")
     private String remark;
 
-    @ApiModelProperty("缁翠慨浜�")
+    @Schema(description = "璁惧椤圭洰")
+    private String machineryCategory;
+
+
+    @Schema(description = "缁翠慨浜�")
     private String maintenanceName;
 
-    @ApiModelProperty("缁翠慨鏃堕棿")
+    @Schema(description = "缁翠慨鏃堕棿")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime maintenanceTime;
 
-    @ApiModelProperty("缁翠慨缁撴灉")
+    @Schema(description = "缁翠慨缁撴灉")
     private String maintenanceResult;
 
-    @ApiModelProperty("鐘舵�� 0 寰呯淮淇� 1瀹岀粨 2 澶辫触")
+    @Schema(description = "楠屾敹浜�")
+    private String acceptanceName;
+
+    @Schema(description = "楠屾敹鏃堕棿")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime acceptanceTime;
+
+    @Schema(description = "楠屾敹澶囨敞")
+    private String acceptanceRemark;
+
+    @Schema(description = "鐘舵�� 0 寰呯淮淇� 1瀹岀粨 2 澶辫触")
+    // 0:寰呯淮淇� 1:瀹岀粨 2:澶辫触 3:寰呴獙鏀�
     private Integer status;
 
-    @ApiModelProperty("鍒涘缓鏃堕棿")
+    @Schema(description = "鍒涘缓鏃堕棿")
     @TableField(fill = FieldFill.INSERT)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime createTime;
 
-    @ApiModelProperty("鏇存柊鏃堕棿")
+    @Schema(description = "鏇存柊鏃堕棿")
     @TableField(fill = FieldFill.INSERT_UPDATE)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime updateTime;
 
-    @ApiModelProperty("鍒涘缓浜�")
+    @Schema(description = "鍒涘缓浜�")
     @TableField(fill = FieldFill.INSERT)
     private Integer createUser;
 
-    @ApiModelProperty("鏇存柊浜�")
+    @Schema(description = "鏇存柊浜�")
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Integer updateUser;
 
-    @ApiModelProperty("绉熸埛id")
+    @Schema(description = "绉熸埛id")
     @TableField(fill = FieldFill.INSERT)
     private Long tenantId;
 
+    @Schema(description = "棰嗙敤澶囦欢ids")
+    private String sparePartsIds;
 
+    @Schema(description = "浣跨敤澶囦欢鍒楄〃")
+    @TableField(exist = false)
+    private List<SparePartUse> sparePartsUseList;
+
+    @Data
+    public static class SparePartUse {
+        private Long id;
+        private Integer quantity;
+    }
+
+    @TableField(fill = FieldFill.INSERT)
+    private Long deptId;
 }

--
Gitblit v1.9.3