From 62cd9d30a8995f11be78aeb49815e7f7d4a11506 Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期二, 13 十月 2026 17:45:18 +0800
Subject: [PATCH] 设备模块后端调整：档案修订保存时自动同步生成本年度校准、核查、保养计划明细（校准计划时间取有效期前一个月，核查、保养取下次日期前一个月）；设备新增保养、核查日期与周期字段；设备树查询改为全部/设备/计量器具分类；新增检测员角色人员查询接口；导入模板移除所属部门列
---
cnas-device/src/main/java/com/ruoyi/device/pojo/Device.java | 25 +++++++++++++++++++++++++
1 files changed, 25 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 ef47471..f10213c 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
@@ -46,6 +46,7 @@
private LocalDateTime acquisitionDate;
@Schema(description = "鏍″噯鏈夋晥鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime activationDate;
@Schema(description = "绠＄悊浜篒d")
@@ -64,11 +65,35 @@
private String calibrationServices;
@Schema(description = "鏈�杩戞牎鍑嗘棩鏈�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime lastCalibrationDate;
@Schema(description = "涓嬫鏍″噯鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime nextCalibrationDate;
+ @Schema(description = "鏈�杩戜繚鍏绘棩鏈�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime lastMaintenanceDate;
+
+ @Schema(description = "涓嬫淇濆吇鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime nextMaintenanceDate;
+
+ @Schema(description = "淇濆吇鍛ㄦ湡(鏈�)")
+ private String maintenanceCycle;
+
+ @Schema(description = "鏈�杩戞牳鏌ユ棩鏈�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime lastExamineDate;
+
+ @Schema(description = "涓嬫鏍告煡鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime nextExamineDate;
+
+ @Schema(description = "鏍告煡鍛ㄦ湡(鏈�)")
+ private String examineCycle;
+
@Schema(description = "璁惧绫诲瀷")
private String largeCategory;
--
Gitblit v1.9.3