From 620bb4712a31791231c4381581f0f60088f079fe Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 27 五月 2026 14:03:45 +0800
Subject: [PATCH] Merge branch 'refs/heads/dev_New_pro' into dev_宁夏_英泽防锈
---
src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java | 63 +++++++++++++++++++++++++++++++
1 files changed, 63 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java b/src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java
index 65faef8..8ceb915 100644
--- a/src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java
+++ b/src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java
@@ -5,11 +5,16 @@
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.dto.DateQueryDto;
+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.List;
+import com.ruoyi.basic.dto.StorageBlobDTO;
+import com.ruoyi.basic.dto.StorageBlobVO;
/**
* 璁惧鍙拌处瀹炰綋绫�
@@ -35,9 +40,36 @@
private String deviceModel;
/**
+ * 璁惧鍝佺墝
+ */
+ @Schema(description = "璁惧鍝佺墝")
+ private String deviceBrand;
+
+ /**
+ * 瀛樻斁浣嶇疆
+ */
+ @Schema(description = "瀛樻斁浣嶇疆")
+ private String storageLocation;
+
+
+ /**
* 渚涘簲鍟嗗悕绉�
*/
private String supplierName;
+
+ /**
+ * 璁惧闄勪欢(鐢ㄤ簬鎺ユ敹)
+ */
+ @TableField(exist = false)
+ @Schema(description = "璁惧闄勪欢鎺ユ敹鍒楄〃")
+ private List<StorageBlobDTO> storageBlobDTOs;
+
+ /**
+ * 璁惧闄勪欢(鐢ㄤ簬杩斿洖)
+ */
+ @TableField(exist = false)
+ @Schema(description = "璁惧闄勪欢灞曠ず鍒楄〃")
+ private List<StorageBlobVO> storageBlobVOs;
/**
* 鍗曚綅
@@ -99,4 +131,35 @@
* 绉熸埛ID
*/
private Long tenantId;
+
+ @Schema(description = "鐘舵��")
+ private String status;
+
+ @Schema(description = "璁″垝杩愯鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate planRuntimeTime;
+
+ @Schema(description = "寮�濮嬭繍琛屾椂闂�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime startRuntimeTime;
+
+ @Schema(description = "缁撴潫杩愯鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime endRuntimeTime;
+
+ @Schema(description = "杩愯鏃堕暱")
+ private String runtimeDuration;
+
+
+ @Schema(description = "鏄惁鎶樻棫 1-鏄� 2-鍚�")
+ private Integer isDepr;
+
+ @Schema(description = "姣忓勾鎶樻棫閲戦")
+ private BigDecimal annualDepreciationAmount;
+
+ @Schema(description = "璁惧绫诲瀷")
+ private String type;
}
--
Gitblit v1.9.3