From 0ac445694a8ffc0e26e54d788d889b3797edf7a0 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期五, 26 六月 2026 09:48:33 +0800
Subject: [PATCH] feat: 添加备件领用记录功能，包括数据库表

---
 src/main/java/com/ruoyi/device/pojo/DeviceRepair.java |   70 +++++++++++++++++++++++++----------
 1 files changed, 50 insertions(+), 20 deletions(-)

diff --git a/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java b/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java
index 3d68c65..67148e1 100644
--- a/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java
+++ b/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java
@@ -3,66 +3,96 @@
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.Api;
+import com.fasterxml.jackson.annotation.JsonFormat;
 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.LocalDateTime;
 import java.util.Date;
+import java.util.List;
+
+import com.ruoyi.measuringinstrumentledger.dto.SparePartsUseDto;
 
 @Data
 @TableName("device_repair")
 public class DeviceRepair {
 
+    @ApiModelProperty("璁惧鎶ヤ慨id")
     private Long id;
 
-    @TableField(value = "device_ledger_id")
     @ApiModelProperty("璁惧鍙拌处id")
-    private String deviceLedgerId;
+    private Long deviceLedgerId;
 
-    @TableField(value = "repair_time")
-    @ApiModelProperty("缁翠慨鏃堕棿")
+    private String deviceName;
+
+    private String deviceModel;
+
+    @ApiModelProperty("鎶ヤ慨鏃堕棿")
     private Date repairTime;
 
-    @TableField(value = "repair_name")
-    @ApiModelProperty("缁翠慨浜�")
+    @ApiModelProperty("鎶ヤ慨浜�")
     private String repairName;
 
-    @TableField(value = "remark")
-    @ApiModelProperty("澶囨敞")
+    @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;
 
-    @TableField(value = "maintenance_name")
     @ApiModelProperty("缁翠慨浜�")
     private String maintenanceName;
 
-    @TableField(value = "maintenance_time")
     @ApiModelProperty("缁翠慨鏃堕棿")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime maintenanceTime;
 
-    @TableField(value = "maintenance_result")
     @ApiModelProperty("缁翠慨缁撴灉")
     private String maintenanceResult;
 
-    @ApiModelProperty("鐘舵��")
+    @ApiModelProperty("鐘舵�� 0寰呯淮淇� 1瀹屾垚 2缁翠慨澶辫触 3寰呴獙鏀�")
     private Integer status;
 
-    @TableField(value = "create_time" ,fill = FieldFill.INSERT)
     @ApiModelProperty("鍒涘缓鏃堕棿")
+    @TableField(fill = FieldFill.INSERT)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime createTime;
 
-    @ApiModelProperty("淇敼鏃堕棿")
+    @ApiModelProperty("鏇存柊鏃堕棿")
+    @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("鍒涘缓浜�")
-    private String createUser;
+    @TableField(fill = FieldFill.INSERT)
+    private Integer createUser;
 
-    @ApiModelProperty("淇敼浜�")
-    private String updateUser;
+    @ApiModelProperty("鏇存柊浜�")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Integer updateUser;
 
     @ApiModelProperty("绉熸埛id")
+    @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