From 6657d65777a1be6b97b745fe0c2be55a8b3ec11e Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期六, 17 一月 2026 13:51:11 +0800
Subject: [PATCH] yys 财务报表，会计报表对接，设备增加字段
---
src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java | 49 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 48 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..75d9250 100644
--- a/src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java
+++ b/src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java
@@ -4,10 +4,13 @@
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;
/**
@@ -15,7 +18,7 @@
*/
@Data
@TableName("device_ledger")
-public class DeviceLedgerDto {
+public class DeviceLedgerDto extends DateQueryDto {
/**
* 涓婚敭ID锛岃嚜澧�
@@ -32,6 +35,19 @@
* 瑙勬牸鍨嬪彿
*/
private String deviceModel;
+
+ /**
+ * 璁惧鍝佺墝
+ */
+ @ApiModelProperty("璁惧鍝佺墝")
+ private String deviceBrand;
+
+ /**
+ * 瀛樻斁浣嶇疆
+ */
+ @ApiModelProperty("瀛樻斁浣嶇疆")
+ private String storageLocation;
+
/**
* 渚涘簲鍟嗗悕绉�
@@ -98,4 +114,35 @@
* 绉熸埛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