From ad45ebdf25cae54a3950bba33aa767fc7a8a43d8 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 22 五月 2026 21:26:13 +0800
Subject: [PATCH] feat: 设备台账新增附件图片上传
---
src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java | 39 ++++++++++++++++++++++++++++-----------
1 files changed, 28 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java b/src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java
index 75d9250..8ceb915 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,20 @@
* 渚涘簲鍟嗗悕绉�
*/
private String supplierName;
+
+ /**
+ * 璁惧闄勪欢(鐢ㄤ簬鎺ユ敹)
+ */
+ @TableField(exist = false)
+ @Schema(description = "璁惧闄勪欢鎺ユ敹鍒楄〃")
+ private List<StorageBlobDTO> storageBlobDTOs;
+
+ /**
+ * 璁惧闄勪欢(鐢ㄤ簬杩斿洖)
+ */
+ @TableField(exist = false)
+ @Schema(description = "璁惧闄勪欢灞曠ず鍒楄〃")
+ private List<StorageBlobVO> storageBlobVOs;
/**
* 鍗曚綅
@@ -115,34 +132,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;
- @ApiModelProperty("鏄惁鎶樻棫 1-鏄� 2-鍚�")
+ @Schema(description = "鏄惁鎶樻棫 1-鏄� 2-鍚�")
private Integer isDepr;
- @ApiModelProperty("姣忓勾鎶樻棫閲戦")
+ @Schema(description = "姣忓勾鎶樻棫閲戦")
private BigDecimal annualDepreciationAmount;
- @ApiModelProperty("璁惧绫诲瀷")
+ @Schema(description = "璁惧绫诲瀷")
private String type;
}
--
Gitblit v1.9.3