From eb975b40828b3a930fb38b75c739a7385b14ee12 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期四, 03 四月 2025 14:48:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/radio_frequency' into radio_frequency

---
 cnas-device/src/main/java/com/ruoyi/device/pojo/Device.java |   39 +++++++++++++++++++++++++++++++++++++++
 1 files changed, 39 insertions(+), 0 deletions(-)

diff --git a/cnas-device/src/main/java/com/ruoyi/device/pojo/Device.java b/cnas-device/src/main/java/com/ruoyi/device/pojo/Device.java
index d403f5a..9d63046 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/pojo/Device.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/pojo/Device.java
@@ -1,9 +1,13 @@
 package com.ruoyi.device.pojo;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -21,64 +25,99 @@
     private Integer id;
 
     @ApiModelProperty(value = "璁惧鍚嶇О")
+    @ExcelProperty(value = "璁惧鍚嶇О")
     private String deviceName;
 
     @ApiModelProperty(value = "en璁惧鍚嶇О")
+    @ExcelProperty(value = "璁惧鍚嶇ОEN")
     private String enDeviceName;
 
     @ApiModelProperty(value = "瑙勬牸鍨嬪彿")
+    @ExcelProperty(value = "瑙勬牸鍨嬪彿")
     private String specificationModel;
 
     @ApiModelProperty(value = "鐢熶骇鍘傚")
+    @ExcelProperty(value = "鐢熶骇鍘傚")
     private String manufacturer;
 
     @ApiModelProperty(value = "鍑哄巶缂栧彿")
+    @ExcelProperty(value = "鍑哄巶缂栧彿")
     private String factoryNo;
 
     @ApiModelProperty(value = "绠＄悊缂栧彿")
+    @ExcelProperty(value = "绠＄悊缂栧彿")
     private String managementNumber;
 
     @ApiModelProperty(value = "鎶�鏈寚鏍�")
+    @ExcelProperty(value = "鎶�鏈寚鏍�")
     private String technicalIndicators;
 
     @ApiModelProperty(value = "璐疆鏃ユ湡")
+    @ExcelProperty(value = "璐疆鏃ユ湡")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime acquisitionDate;
 
     @ApiModelProperty(value = "鏍″噯鏈夋晥鏃ユ湡")
+    @ExcelProperty(value = "鍚敤鏃ユ湡")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime activationDate;
 
     @ApiModelProperty(value = "绠＄悊浜篒d")
     private Integer equipmentManager;
 
+    @TableField(select = false,exist = false)
+    @ExcelProperty(value = "绠＄悊浜�")
+    private String equipmentManagerName;
+
     @ApiModelProperty(value = "瀛樻斁鐐�")
+    @ExcelProperty(value = "瀛樻斁鐐�")
     private String storagePoint;
 
     @ApiModelProperty(value = "鎵�灞為儴闂↖d")
     private Integer subordinateDepartmentsId;
 
+    @TableField(select = false,exist = false)
+    @ExcelProperty(value = "鎵�灞為儴闂�")
+    private String subordinateDepartments;
+
     @ApiModelProperty(value = "妫�楠岄」鐩甀d")
     private String insProductIds;
 
     @ApiModelProperty(value = "鏍″噯鏈嶅姟鏈烘瀯")
+    @ExcelProperty(value = "鏍″噯鏈嶅姟鏈烘瀯")
     private String calibrationServices;
 
     @ApiModelProperty(value = "鏈�杩戞牎鍑嗘棩鏈�")
+    @ExcelProperty(value = "鏈�杩戞牎鍑嗘棩鏈�")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime lastCalibrationDate;
 
     @ApiModelProperty(value = "涓嬫鏍″噯鏃ユ湡")
+    @ExcelProperty(value = "涓嬫鏍″噯鏃ユ湡")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime nextCalibrationDate;
 
     @ApiModelProperty(value = "璁惧绫诲瀷")
+    @ExcelProperty(value = "璁惧鍒嗙被")
     private String largeCategory;
 
     @ApiModelProperty(value = "鍗曚环")
+    @ExcelProperty(value = "鍗曚环")
     private BigDecimal unitPrice;
 
     @ApiModelProperty(value = "璁惧鐘舵��")
     private Integer deviceStatus;
 
+    @TableField(select = false,exist = false)
+    @ExcelProperty(value = "璁惧鐘舵��")
+    private String deviceStatusName;
+
     @ApiModelProperty(value = "鏍″噯鍛ㄦ湡(鏈�)")
+    @ExcelProperty(value = "鏍″噯鍛ㄦ湡(鏈�)")
     private String calibrationDate;
 
     @ApiModelProperty(value = "鍥剧墖涓婁紶")

--
Gitblit v1.9.3