From 11af23e0c7976eed1211ba2ca0beae3a12e19310 Mon Sep 17 00:00:00 2001
From: lxp <1928192722@qq.com>
Date: 星期三, 12 三月 2025 15:37:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 cnas-require/src/main/java/com/ruoyi/requier/pojo/DeviceMetricRecord.java |  115 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 115 insertions(+), 0 deletions(-)

diff --git a/cnas-require/src/main/java/com/ruoyi/requier/pojo/DeviceMetricRecord.java b/cnas-require/src/main/java/com/ruoyi/requier/pojo/DeviceMetricRecord.java
new file mode 100644
index 0000000..c655959
--- /dev/null
+++ b/cnas-require/src/main/java/com/ruoyi/requier/pojo/DeviceMetricRecord.java
@@ -0,0 +1,115 @@
+package com.ruoyi.requier.pojo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * <p>
+ * 璁惧鏍″噯 - 鏍″噯璁板綍
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2024-09-27 10:20:01
+ */
+@Getter
+@Setter
+@TableName("device_metric_record")
+@ApiModel(value = "DeviceMetricRecord瀵硅薄", description = "璁惧鏍″噯 - 鏍″噯璁板綍")
+@ExcelIgnoreUnannotated
+public class DeviceMetricRecord implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("涓婚敭id")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty("璁板綍缂栧彿")
+    @ExcelProperty(value = "璁板綍缂栧彿",index = 0)
+    private String processNumber;
+
+    @ApiModelProperty("璁¢噺鍗曚綅")
+    @ExcelProperty(value = "鏈烘瀯",index = 1)
+    private String unitOfMeasure;
+
+    @ApiModelProperty("鏍″噯鏃ユ湡")
+    @ExcelProperty(value = "鏍″噯/鏍告煡鏃ユ湡",index = 5)
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @ColumnWidth(20)
+    private Date calibrationDate;
+
+    @ApiModelProperty("涓嬫鏍″噯鏃ユ湡")
+    @ExcelProperty(value = "涓嬫鏍″噯/鏍告煡鏃ユ湡",index = 6)
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @ColumnWidth(20)
+    private Date nextCalibrationDate;
+
+    @ApiModelProperty("璁$畻鍣ㄥ叿")
+    private String calculatingApparatus;
+
+    @ApiModelProperty("璁$畻鏍囧噯閲忕▼")
+    private String standardRange;
+
+    @ApiModelProperty("璁¢噺鏍囧噯涓嶇‘瀹氬害")
+    private String calibrationStandardUncertainty;
+
+    @ApiModelProperty("渚濇嵁鏂囦欢")
+    private String byDocument;
+
+    @ApiModelProperty("璇佷功缂栧彿")
+    @ExcelProperty(value = "鏍″噯/鏍告煡璇佷功缂栧彿",index = 3)
+    private String certificateSerialNumber;
+
+    @ApiModelProperty("鐘舵��")
+    @ExcelProperty(value = "鏍″噯/鏍告煡缁撹",index = 2)
+    private String status;
+
+    @ApiModelProperty("鍘熸枃浠跺悕绉�")
+    private String fileName;
+
+    @ApiModelProperty("绯荤粺鐢熸垚鏂囦欢鍚嶇О")
+    private String systemFileName;
+
+    @ApiModelProperty("澶囨敞")
+    @ExcelProperty(value = "璇存槑",index = 4)
+    private String remark;
+
+    @ApiModelProperty("璁惧id")
+    private Integer deviceId;
+
+    @ApiModelProperty("鍒涘缓鏃堕棿 / 鐧昏鏃ユ湡")
+    @TableField(fill = FieldFill.INSERT)
+    @ExcelProperty(value = "鐧昏鏃ユ湡",index = 9)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ColumnWidth(20)
+    private LocalDateTime createTime;
+
+    @ApiModelProperty("鐧昏浜�")
+    @ExcelProperty(value = "鐧昏浜�",index = 8)
+    private String createUser;
+
+    @ApiModelProperty("calibrate锛氭牎鍑嗭紱examine锛氭牳鏌�")
+    private String type;
+
+    @ApiModelProperty("纭鏃堕棿")
+    @ExcelProperty(value = "纭鏃ユ湡",index = 7)
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @ColumnWidth(20)
+    private Date confirmDate;
+}

--
Gitblit v1.9.3