From dd571bf55de7f9a72d458adc179958ed2f9473c0 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期一, 21 八月 2023 09:39:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MetricalInformationServiceImpl.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MetricalInformationServiceImpl.java b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MetricalInformationServiceImpl.java
index a2ad0d9..c52e053 100644
--- a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MetricalInformationServiceImpl.java
+++ b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MetricalInformationServiceImpl.java
@@ -36,12 +36,13 @@
String fileName = FileSaveUtil.StoreFile(file);
metricalInformation.setFilePath(fileName);
}
+ metricalInformation.setCode(MyUtil.getTimeSixNumberCode("METRICALCODE","METRICALCODE"));
return metricalInformationMapper.insert(metricalInformation);
}
@Override
- public List<Map<String, Object>> getListEquipmentPointInformation() {
- return metricalInformationMapper.getListEquipmentPointInformation();
+ public List<Map<String, Object>> getListEquipmentPointInformation(String InstrumentId) {
+ return metricalInformationMapper.getListEquipmentPointInformation(InstrumentId);
}
@Override
--
Gitblit v1.9.3