From d17d4d1ac98865d2a71b4f24771b7b76e0839ed3 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 10 四月 2026 14:08:41 +0800
Subject: [PATCH] yys 1.设备区域 2.设备巡检，维保，保养多选 3.数采

---
 src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java |   96 +++++++++++++++++++++++-------------------------
 1 files changed, 46 insertions(+), 50 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..17ecb06 100644
--- a/src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java
+++ b/src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java
@@ -4,98 +4,94 @@
 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.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
-/**
- * 璁惧鍙拌处瀹炰綋绫�
- */
 @Data
 @TableName("device_ledger")
-public class DeviceLedgerDto {
-
-    /**
-     * 涓婚敭ID锛岃嚜澧�
-     */
+public class DeviceLedgerDto extends DateQueryDto {
 
     private Long id;
 
-    /**
-     * 璁惧鍚嶇О
-     */
     private String deviceName;
 
-    /**
-     * 瑙勬牸鍨嬪彿
-     */
     private String deviceModel;
 
-    /**
-     * 渚涘簲鍟嗗悕绉�
-     */
+    @ApiModelProperty("璁惧鍝佺墝")
+    private String deviceBrand;
+
+    @ApiModelProperty("瀛樻斁浣嶇疆")
+    private String storageLocation;
+
+    @ApiModelProperty("璁惧鍖哄煙ID")
+    private Long areaId;
+
+    @ApiModelProperty("璁惧鍖哄煙鍚嶇О")
+    private String areaName;
+
     private String supplierName;
 
-    /**
-     * 鍗曚綅
-     */
     private String unit;
 
-    /**
-     * 鏁伴噺
-     */
     private BigDecimal number;
 
-    /**
-     * 鍚◣鍗曚环
-     */
     private BigDecimal taxIncludingPriceUnit;
 
-    /**
-     * 鍚◣鎬讳环
-     */
     private BigDecimal taxIncludingPriceTotal;
 
-    /**
-     * 绋庣巼
-     */
     private BigDecimal taxRate;
 
-    /**
-     * 涓嶅惈绋庢�讳环
-     */
     private BigDecimal unTaxIncludingPriceTotal;
 
-    /**
-     * 褰曞叆鏃堕棿
-     */
     @TableField(fill = FieldFill.INSERT)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime createTime;
 
-    /**
-     * 鏇存柊鏃堕棿
-     */
     @TableField(fill = FieldFill.INSERT_UPDATE)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime updateTime;
 
-    /**
-     * 褰曞叆浜�
-     */
     private String createUser;
 
-    /**
-     * 鏇存柊浜�
-     */
     private String updateUser;
 
-    /**
-     * 绉熸埛ID
-     */
     private Long tenantId;
+
+    @ApiModelProperty("鐘舵��")
+    private String status;
+
+    @ApiModelProperty("璁″垝杩愯鏃堕棿")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private LocalDate planRuntimeTime;
+
+    @ApiModelProperty("寮�濮嬭繍琛屾椂闂�")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime startRuntimeTime;
+
+    @ApiModelProperty("缁撴潫杩愯鏃堕棿")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime endRuntimeTime;
+
+    @ApiModelProperty("杩愯鏃堕暱")
+    private String runtimeDuration;
+
+    @ApiModelProperty("鏄惁鎶樻棫 1-鏄� 2-鍚�")
+    private Integer isDepr;
+
+    @ApiModelProperty("姣忓勾鎶樻棫閲戦")
+    private BigDecimal annualDepreciationAmount;
+
+    @ApiModelProperty("璁惧绫诲瀷")
+    private String type;
 }

--
Gitblit v1.9.3