From b4a9e12e00b78e1aef8acda070434de9ffd0d66a Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期五, 24 四月 2026 15:29:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

---
 src/main/java/com/ruoyi/device/pojo/DeviceRepair.java |   62 +++++++++++++++++++------------
 1 files changed, 38 insertions(+), 24 deletions(-)

diff --git a/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java b/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java
index 8b4dbbc..a469ee1 100644
--- a/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java
+++ b/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java
@@ -4,78 +4,92 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 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;
 
 @Data
 @TableName("device_repair")
 public class DeviceRepair {
 
-    @ApiModelProperty("璁惧鎶ヤ慨id")
+    @Schema(description = "璁惧鎶ヤ慨id")
     private Long id;
 
-    @ApiModelProperty("璁惧鍙拌处id")
+    @Schema(description = "璁惧鍙拌处id")
     private Long deviceLedgerId;
-    @ApiModelProperty("璁惧鍚嶇О")
+
     private String deviceName;
-    @ApiModelProperty("璁惧鍨嬪彿")
+
     private String deviceModel;
 
-    @ApiModelProperty("鎶ヤ慨鏃堕棿")
+    @Schema(description = "鎶ヤ慨鏃堕棿")
     private Date repairTime;
 
-    @ApiModelProperty("鎶ヤ慨浜�")
+    @Schema(description = "鎶ヤ慨浜�")
     private String repairName;
 
-    @ApiModelProperty("鎶ヤ慨鍐呭")
+    @Schema(description = "鎶ヤ慨鍐呭")
     private String remark;
+    
+    @Schema(description = "璁惧绫荤洰")
+    private String machineryCategory;
 
-    @ApiModelProperty("缁翠慨浜�")
+
+    @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瀹℃牳澶辫触,3缁翠慨涓�,4缁翠慨閫氳繃,5缁翠慨澶辫触")
+    @Schema(description = "鐘舵�� 0 寰呯淮淇� 1瀹岀粨 2 澶辫触")
     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;
-    @ApiModelProperty("缁翠慨浠锋牸")
-    private BigDecimal maintenancePrice;
-    @ApiModelProperty("瀹℃壒浜篿d")
-    private Integer approverId;
+
+    @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