From a8e4132c3e2e9c3b3fcb0360901b35571b6464ea Mon Sep 17 00:00:00 2001
From: hsy <1029150275@qq.com>
Date: 星期五, 28 八月 2026 10:13:01 +0800
Subject: [PATCH] feat: 综合业务模块功能补充与实体拓展

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

diff --git a/src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java b/src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java
index 604001d..77510dd 100644
--- a/src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java
+++ b/src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java
@@ -5,13 +5,16 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.dto.DateQueryDto;
-import io.swagger.annotations.ApiModelProperty;
+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;
 
 /**
  * 璁惧鍙拌处瀹炰綋绫�
@@ -39,13 +42,13 @@
     /**
      * 璁惧鍝佺墝
      */
-    @ApiModelProperty("璁惧鍝佺墝")
+    @Schema(description = "璁惧鍝佺墝")
     private String deviceBrand;
 
     /**
      * 瀛樻斁浣嶇疆
      */
-    @ApiModelProperty("瀛樻斁浣嶇疆")
+    @Schema(description = "瀛樻斁浣嶇疆")
     private String storageLocation;
 
 
@@ -53,6 +56,56 @@
      * 渚涘簲鍟嗗悕绉�
      */
     private String supplierName;
+
+    @Schema(description = "璁惧缂栧彿")
+    private String uniqueCode;
+
+    @Schema(description = "鍑哄巶缂栧彿")
+    private String factoryNumber;
+
+    @Schema(description = "鍒堕�犲巶鍟�")
+    private String manufacturer;
+
+    @Schema(description = "璧勪骇鍘熷��")
+    private BigDecimal originalAssetValue;
+
+    @Schema(description = "璐疆鏃ユ湡")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private LocalDate purchaseDate;
+
+    @Schema(description = "鍚敤鏃ユ湡")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private LocalDate activationDate;
+
+    @Schema(description = "涓昏鎶�鏈弬鏁�")
+    private String technicalParameters;
+
+    @Schema(description = "涓昏鐢ㄩ��")
+    private String mainPurpose;
+
+    @Schema(description = "璐ｄ换浜�")
+    private String responsiblePerson;
+
+    @Schema(description = "寤烘。鏃ユ湡")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private LocalDate filingDate;
+
+    /**
+     * 璁惧闄勪欢(鐢ㄤ簬鎺ユ敹)
+     */
+    @TableField(exist = false)
+    @Schema(description = "璁惧闄勪欢鎺ユ敹鍒楄〃")
+    private List<StorageBlobDTO> storageBlobDTOs;
+
+    /**
+     * 璁惧闄勪欢(鐢ㄤ簬杩斿洖)
+     */
+    @TableField(exist = false)
+    @Schema(description = "璁惧闄勪欢灞曠ず鍒楄〃")
+    private List<StorageBlobVO> storageBlobVOs;
 
     /**
      * 鍗曚綅
@@ -115,24 +168,34 @@
      */
     private Long tenantId;
 
-    @ApiModelProperty("鐘舵��")
+    @Schema(description = "鐘舵��")
     private String status;
 
-    @ApiModelProperty("璁″垝杩愯鏃堕棿")
+    @Schema(description = "璁″垝杩愯鏃堕棿")
     @JsonFormat(pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private LocalDate planRuntimeTime;
 
-    @ApiModelProperty("寮�濮嬭繍琛屾椂闂�")
+    @Schema(description = "寮�濮嬭繍琛屾椂闂�")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime startRuntimeTime;
 
-    @ApiModelProperty("缁撴潫杩愯鏃堕棿")
+    @Schema(description = "缁撴潫杩愯鏃堕棿")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime endRuntimeTime;
 
-    @ApiModelProperty("杩愯鏃堕暱")
+    @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