From 4635770544e2d57416ad88a8983ee293919f5fec Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 25 五月 2026 09:25:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

---
 src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java |   66 ++++++++++++++++++++++++++++++++
 1 files changed, 65 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java b/src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java
index f299773..8ceb915 100644
--- a/src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java
+++ b/src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java
@@ -4,18 +4,24 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 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;
 
 /**
  * 璁惧鍙拌处瀹炰綋绫�
  */
 @Data
 @TableName("device_ledger")
-public class DeviceLedgerDto {
+public class DeviceLedgerDto extends DateQueryDto {
 
     /**
      * 涓婚敭ID锛岃嚜澧�
@@ -34,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;
 
     /**
      * 鍗曚綅
@@ -98,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