From c3a981e80973ac52b5988aca62b87409976c6fb1 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 18 六月 2026 13:09:28 +0800
Subject: [PATCH] 1.计量器具台账上传附件报错 2.质量拉的数据不对（未明确） 3.计量器具台账逾期的做标红提醒 4.设备保养定时任务和记录要加上具体的保养内容 5.质量要区分质检规则抽检还是全检，抽检的话是抽多少百分比 6.供应商管理东西太少了，没有资质文件啊这些东西（是不是可以参考pro） 7.采购审批把人从李莹莹改成龙红星

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

diff --git a/src/main/java/com/ruoyi/device/pojo/DeviceLedger.java b/src/main/java/com/ruoyi/device/pojo/DeviceLedger.java
index cd55444..4f21280 100644
--- a/src/main/java/com/ruoyi/device/pojo/DeviceLedger.java
+++ b/src/main/java/com/ruoyi/device/pojo/DeviceLedger.java
@@ -4,8 +4,8 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -18,7 +18,7 @@
  */
 @Data
 @TableName("device_ledger")
-@ApiModel
+@Schema
 public class DeviceLedger {
 
     /**
@@ -30,31 +30,33 @@
     /**
      * 璁惧鍚嶇О
      */
-    @ApiModelProperty("璁惧鍚嶇О")
+    @Schema(description = "璁惧鍚嶇О")
     private String deviceName;
 
     /**
      * 瑙勬牸鍨嬪彿
      */
-    @ApiModelProperty("瑙勬牸鍨嬪彿")
+    @Schema(description = "瑙勬牸鍨嬪彿")
     private String deviceModel;
 
     /**
      * 璁惧鍝佺墝
      */
-    @ApiModelProperty("璁惧鍝佺墝")
+    @Schema(description = "璁惧鍝佺墝")
     private String deviceBrand;
 
     /**
      * 瀛樻斁浣嶇疆
      */
-    @ApiModelProperty("瀛樻斁浣嶇疆")
+    @Schema(description = "瀛樻斁浣嶇疆")
     private String storageLocation;
 
     /**
      * 渚涘簲鍟嗗悕绉�
      */
     private String supplierName;
+
+    private Long areaId;
 
     /**
      * 鍗曚綅
@@ -122,44 +124,50 @@
 
     /* ***************************     杩愯绠＄悊        ***************************   */
 
-    @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;
 
     @TableField(exist = false)
-    @ApiModelProperty("绱鎶樻棫")
+    @Schema(description = "绱鎶樻棫")
     private BigDecimal deprAmount;
 
     @TableField(exist = false)
-    @ApiModelProperty("鍑�鍊�")
+    @Schema(description = "鍑�鍊�")
     private BigDecimal netValue;
 
-    @ApiModelProperty("璁惧绫诲瀷")
+    @Schema(description = "璁惧绫诲瀷")
     private String type;
 
     @TableField(fill = FieldFill.INSERT)
     private Long deptId;
+
+    @ApiModelProperty("鏄惁涓虹墿鑱旇澶� 0-鍚� 1-鏄�")
+    private Integer isIotDevice;
+
+    @ApiModelProperty("澶栭儴缂栫爜")
+    private String externalCode;
 }

--
Gitblit v1.9.3