From c495d6822005c16aad9257e018ecebfce62ff404 Mon Sep 17 00:00:00 2001
From: ls <lslvxy@163.com>
Date: Fri, 18 Jul 2025 22:53:00 +0800
Subject: [PATCH] fix roomno

---
 .../modules/database/entity/ExperimentDeviationEquipment.java | 1 -
 .../service/impl/ExperimentDeviationEquipmentServiceImpl.java | 4 ++++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentDeviationEquipment.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentDeviationEquipment.java
index 4099378..9fb886a 100644
--- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentDeviationEquipment.java
+++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentDeviationEquipment.java
@@ -165,7 +165,6 @@ public class ExperimentDeviationEquipment implements Serializable {
      */
     @Excel(name = "计量有效期", width = 15)
     @Schema(description = "计量有效期")
-    @TableField(exist = false)
     private java.lang.String     measurementValidity;
     /**
      * 房间号
diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentDeviationEquipmentServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentDeviationEquipmentServiceImpl.java
index 87cbf10..b8be7e4 100644
--- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentDeviationEquipmentServiceImpl.java
+++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentDeviationEquipmentServiceImpl.java
@@ -65,6 +65,10 @@ public class ExperimentDeviationEquipmentServiceImpl extends ServiceImpl<Experim
                 experimentDeviationEquipment.setEquipmentModel(one.getModel());
                 experimentDeviationEquipment.setEquipmentId(one.getId());
                 experimentDeviationEquipment.setEquipmentImage(one.getImages());
+                experimentDeviationEquipment.setRoomNo(one.getRoomNo());
+                if (StringUtils.isBlank(experimentDeviationEquipment.getMeasurementValidity())) {
+                    experimentDeviationEquipment.setMeasurementValidity(one.getExpireDate());
+                }
             }
         }
         String sampleId = experimentDeviationEquipment.getSampleId();