From 0d217eeff1f9d23844a54e8dd2ffebd8b4c2c1c7 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 20 一月 2026 16:20:30 +0800
Subject: [PATCH] feat(production): 迁移生产管控

---
 src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java |   29 +++++++++++++++++++++--------
 1 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java b/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java
index dffcdd5..7299b26 100644
--- a/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java
+++ b/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java
@@ -5,6 +5,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import java.util.Date;
 
 @Data
@@ -12,11 +14,13 @@
 
 
     @ApiModelProperty("璁惧淇濆吇id")
-
     private Long id;
 
+    @ApiModelProperty("璁惧淇濆吇閲戦")
+    private BigDecimal maintenancePrice;
+
     @ApiModelProperty("璁惧鍙拌处id")
-    private String deviceLedgerId;
+    private Long deviceLedgerId;
 
     @ApiModelProperty("璁惧鍚嶇О")
     private String deviceName;
@@ -25,27 +29,33 @@
     private String deviceModel;
 
     @ApiModelProperty("璁″垝淇濆吇鏃ユ湡")
-    private Date maintenancePlanTime;
+    private String maintenancePlanTimeReq;
+
+    @ApiModelProperty("璁″垝淇濆吇鏃ユ湡")
+    private LocalDateTime maintenancePlanTime;
 
     @ApiModelProperty("瀹為檯淇濆吇浜�")
     private String maintenanceActuallyName;
 
     @ApiModelProperty("瀹為檯淇濆吇鏃ユ湡")
-    private Date maintenanceActuallyTime;
+    private LocalDateTime maintenanceActuallyTime;
+
+    @ApiModelProperty("瀹為檯淇濆吇鏃ユ湡")
+    private String maintenanceActuallyTimeReq;
 
     @ApiModelProperty("淇濆吇缁撴灉 0 缁翠慨 1 瀹屽ソ")
-    private Integer maintenanceResult;
+    private String maintenanceResult;
 
-    @ApiModelProperty("鐘舵�� 0 寰呬繚鍏� 1 瀹岀粨")
+    @ApiModelProperty("鐘舵�� 0 寰呬繚鍏� 1 瀹岀粨 2 澶辫触")
     private Integer status;
 
     @ApiModelProperty("鍒涘缓鏃堕棿")
     @TableField(fill = FieldFill.INSERT)
-    private Date createTime;
+    private LocalDateTime createTime;
 
     @ApiModelProperty("鏇存柊鏃堕棿")
     @TableField(fill = FieldFill.UPDATE)
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
     @ApiModelProperty("鍒涘缓浜�")
     @TableField(fill = FieldFill.INSERT)
@@ -58,4 +68,7 @@
     @ApiModelProperty("绉熸埛id")
     @TableField(fill = FieldFill.INSERT)
     private Long tenantId;
+
+    @ApiModelProperty("鍒涘缓浜哄悕绉�")
+    private String createUserName;
 }

--
Gitblit v1.9.3