From 1a89a2eca92540f2a6e9ed5c140b00610f2f4bfc Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 13 四月 2026 14:11:50 +0800
Subject: [PATCH] yys 1.设备巡检，保养加入年维度

---
 src/main/java/com/ruoyi/device/pojo/DeviceLedger.java |   81 ++++++++++++----------------------------
 1 files changed, 24 insertions(+), 57 deletions(-)

diff --git a/src/main/java/com/ruoyi/device/pojo/DeviceLedger.java b/src/main/java/com/ruoyi/device/pojo/DeviceLedger.java
index ca59a12..7631866 100644
--- a/src/main/java/com/ruoyi/device/pojo/DeviceLedger.java
+++ b/src/main/java/com/ruoyi/device/pojo/DeviceLedger.java
@@ -13,114 +13,64 @@
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 
-/**
- * 璁惧鍙拌处瀹炰綋绫�
- */
 @Data
 @TableName("device_ledger")
 @ApiModel
 public class DeviceLedger {
 
-    /**
-     * 涓婚敭ID锛岃嚜澧�
-     */
-
     private Long id;
 
-    /**
-     * 璁惧鍚嶇О
-     */
     @ApiModelProperty("璁惧鍚嶇О")
     private String deviceName;
 
-    /**
-     * 瑙勬牸鍨嬪彿
-     */
     @ApiModelProperty("瑙勬牸鍨嬪彿")
     private String deviceModel;
 
-    /**
-     * 璁惧鍝佺墝
-     */
     @ApiModelProperty("璁惧鍝佺墝")
     private String deviceBrand;
 
-    /**
-     * 瀛樻斁浣嶇疆
-     */
     @ApiModelProperty("瀛樻斁浣嶇疆")
     private String storageLocation;
 
-    /**
-     * 渚涘簲鍟嗗悕绉�
-     */
+    @ApiModelProperty("璁惧鍖哄煙ID")
+    private Long areaId;
+
+    @TableField(exist = false)
+    @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;
 
-    /**
-     * 褰曞叆浜�
-     */
     @TableField(fill = FieldFill.INSERT)
     private Integer createUser;
 
-    /**
-     * 鏇存柊浜�
-     */
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Integer updateUser;
 
-    /**
-     * 绉熸埛ID
-     */
     @TableField(fill = FieldFill.INSERT)
     private Long tenantId;
-
-    /* ***************************     杩愯绠＄悊        ***************************   */
 
     @ApiModelProperty("鐘舵��")
     private String status;
@@ -142,4 +92,21 @@
 
     @ApiModelProperty("杩愯鏃堕暱")
     private String runtimeDuration;
+
+    @ApiModelProperty("鏄惁鎶樻棫 1-鏄� 2-鍚�")
+    private Integer isDepr;
+
+    @ApiModelProperty("姣忓勾鎶樻棫閲戦")
+    private BigDecimal annualDepreciationAmount;
+
+    @TableField(exist = false)
+    @ApiModelProperty("绱鎶樻棫")
+    private BigDecimal deprAmount;
+
+    @TableField(exist = false)
+    @ApiModelProperty("鍑�鍊�")
+    private BigDecimal netValue;
+
+    @ApiModelProperty("璁惧绫诲瀷")
+    private String type;
 }

--
Gitblit v1.9.3