fix roomno
This commit is contained in:
@@ -165,7 +165,6 @@ public class ExperimentDeviationEquipment implements Serializable {
|
|||||||
*/
|
*/
|
||||||
@Excel(name = "计量有效期", width = 15)
|
@Excel(name = "计量有效期", width = 15)
|
||||||
@Schema(description = "计量有效期")
|
@Schema(description = "计量有效期")
|
||||||
@TableField(exist = false)
|
|
||||||
private java.lang.String measurementValidity;
|
private java.lang.String measurementValidity;
|
||||||
/**
|
/**
|
||||||
* 房间号
|
* 房间号
|
||||||
|
|||||||
@@ -65,6 +65,10 @@ public class ExperimentDeviationEquipmentServiceImpl extends ServiceImpl<Experim
|
|||||||
experimentDeviationEquipment.setEquipmentModel(one.getModel());
|
experimentDeviationEquipment.setEquipmentModel(one.getModel());
|
||||||
experimentDeviationEquipment.setEquipmentId(one.getId());
|
experimentDeviationEquipment.setEquipmentId(one.getId());
|
||||||
experimentDeviationEquipment.setEquipmentImage(one.getImages());
|
experimentDeviationEquipment.setEquipmentImage(one.getImages());
|
||||||
|
experimentDeviationEquipment.setRoomNo(one.getRoomNo());
|
||||||
|
if (StringUtils.isBlank(experimentDeviationEquipment.getMeasurementValidity())) {
|
||||||
|
experimentDeviationEquipment.setMeasurementValidity(one.getExpireDate());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
String sampleId = experimentDeviationEquipment.getSampleId();
|
String sampleId = experimentDeviationEquipment.getSampleId();
|
||||||
|
|||||||
Reference in New Issue
Block a user