From 1400e91e8c807fb40707d1f4cd88a99b096242d8 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 14 八月 2025 09:45:16 +0800
Subject: [PATCH] 生成总报告数值为空逻辑校验
---
cnas-server/src/main/java/com/yuanchu/mom/dto/DeviceDto.java | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/dto/DeviceDto.java b/cnas-server/src/main/java/com/yuanchu/mom/dto/DeviceDto.java
index 8bd8ce8..e140fc0 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/dto/DeviceDto.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/dto/DeviceDto.java
@@ -7,6 +7,8 @@
import lombok.Data;
import lombok.NoArgsConstructor;
+import java.time.LocalDateTime;
+
@Data
@AllArgsConstructor
@NoArgsConstructor
@@ -22,5 +24,26 @@
@ValueTableShow(13)
@ApiModelProperty(value = "妫�楠岄」鐩�")
- private Integer insProductItem;
+ private String insProductItem;
+
+
+ @ApiModelProperty(value = "绠＄悊浜哄鍚�")
+ private String equipmentManagerName;
+
+ @ApiModelProperty(value = "琚巿鏉冧汉濮撳悕")
+ private String authorizedPersonName;
+
+ @ApiModelProperty(value = "鏍稿噯璇佷功缂栧彿")
+ private String calibrateNo;
+
+ @ValueTableShow(value = 15, name = "鏈�杩戞牎鍑嗘棩鏈�")
+ @ApiModelProperty(value = "鏈�杩戞牎鍑嗘棩鏈�")
+ private LocalDateTime lastCalibrationDateTwo;
+
+ @ValueTableShow(value = 16, name = "涓嬫鏍″噯鏃ユ湡")
+ @ApiModelProperty(value = "涓嬫鏍″噯鏃ユ湡")
+ private LocalDateTime nextCalibrationDateTwo;
+
+ @ApiModelProperty(value = "鏍″噯鎻愰啋")
+ private String status;
}
--
Gitblit v1.9.3