From 0ca70b916ced54bf402a2eb409aaaa52ecfb0e6a Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期五, 03 四月 2026 13:24:23 +0800
Subject: [PATCH] 保养后生成领用记录,新增备件领用记录列表接口
---
src/main/java/com/ruoyi/device/pojo/DeviceRepair.java | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 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..055a724 100644
--- a/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java
+++ b/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java
@@ -4,15 +4,13 @@
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 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")
@@ -23,9 +21,9 @@
@ApiModelProperty("璁惧鍙拌处id")
private Long deviceLedgerId;
- @ApiModelProperty("璁惧鍚嶇О")
+
private String deviceName;
- @ApiModelProperty("璁惧鍨嬪彿")
+
private String deviceModel;
@ApiModelProperty("鎶ヤ慨鏃堕棿")
@@ -48,7 +46,7 @@
@ApiModelProperty("缁翠慨缁撴灉")
private String maintenanceResult;
- @ApiModelProperty("鐘舵��:0瀹℃牳涓�,1瀹℃牳閫氳繃,2瀹℃牳澶辫触,3缁翠慨涓�,4缁翠慨閫氳繃,5缁翠慨澶辫触")
+ @ApiModelProperty("鐘舵�� 0 寰呯淮淇� 1瀹岀粨 2 澶辫触")
private Integer status;
@ApiModelProperty("鍒涘缓鏃堕棿")
@@ -74,8 +72,17 @@
@ApiModelProperty("绉熸埛id")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
- @ApiModelProperty("缁翠慨浠锋牸")
- private BigDecimal maintenancePrice;
- @ApiModelProperty("瀹℃壒浜篿d")
- private Integer approverId;
+
+ @ApiModelProperty("棰嗙敤澶囦欢ids")
+ private String sparePartsIds;
+
+ @ApiModelProperty("浣跨敤澶囦欢鍒楄〃")
+ @TableField(exist = false)
+ private List<SparePartUse> sparePartsUseList;
+
+ @Data
+ public static class SparePartUse {
+ private Long id;
+ private Integer quantity;
+ }
}
--
Gitblit v1.9.3