From 9d4cf882be7a2ad8d3cc422bcd0dbc461f626f58 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 20 一月 2026 15:12:30 +0800
Subject: [PATCH] feat(production): 迁移生产管控
---
src/main/java/com/ruoyi/device/execl/DeviceMaintenanceExeclDto.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/execl/DeviceMaintenanceExeclDto.java b/src/main/java/com/ruoyi/device/execl/DeviceMaintenanceExeclDto.java
index 92dd71a..e276703 100644
--- a/src/main/java/com/ruoyi/device/execl/DeviceMaintenanceExeclDto.java
+++ b/src/main/java/com/ruoyi/device/execl/DeviceMaintenanceExeclDto.java
@@ -4,6 +4,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.Date;
@@ -17,11 +18,16 @@
@Excel(name = "璁惧鍚嶇О")
private String deviceName;
+
+ @ApiModelProperty("璁惧淇濆吇閲戦")
+ @Excel(name = "璁惧淇濆吇閲戦")
+ private BigDecimal maintenancePrice;
+
@Excel(name = "瑙勬牸鍨嬪彿")
@ApiModelProperty("瑙勬牸鍨嬪彿")
private String deviceModel;
- @Excel(name = "璁″垝淇濆吇鏃ユ湡")
+ @Excel(name = "璁″垝淇濆吇鏃ユ湡", dateFormat = "yyyy-MM-dd HH:mm:ss", width = 30)
@ApiModelProperty("璁″垝淇濆吇鏃ユ湡")
private Date maintenancePlanTime;
@@ -30,23 +36,23 @@
private String maintenanceActuallyName;
@ApiModelProperty("瀹為檯淇濆吇鏃ユ湡")
- @Excel(name = "瀹為檯淇濆吇鏃ユ湡")
+ @Excel(name = "瀹為檯淇濆吇鏃ユ湡", dateFormat = "yyyy-MM-dd HH:mm:ss", width = 30)
private LocalDateTime maintenanceActuallyTime;
@ApiModelProperty("淇濆吇缁撴灉 0 缁翠慨 1 瀹屽ソ")
@Excel(name = "淇濆吇缁撴灉")
private String maintenanceResult;
- @ApiModelProperty("鐘舵�� 0 寰呬繚鍏� 1 瀹岀粨")
+ @ApiModelProperty("鐘舵�� 0 寰呬繚鍏� 1 瀹岀粨 2 澶辫触")
@Excel(name = "鐘舵��")
private String status;
@ApiModelProperty("鍒涘缓鏃堕棿")
- @Excel(name = "褰曞叆鏃堕棿")
+ @Excel(name = "褰曞叆鏃堕棿", dateFormat = "yyyy-MM-dd HH:mm:ss", width = 30)
private Date createTime;
@ApiModelProperty("鍒涘缓浜�")
- @Excel(name = "褰曞叆浜�")
+// @Excel(name = "褰曞叆浜�")
private String createUser;
}
--
Gitblit v1.9.3