From 1ab5a65898b12ca07cbf38eaf2028eeae2ce790c Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期一, 28 八月 2023 10:51:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionService.java | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionService.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionService.java
index e473e4a..fd58af1 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionService.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionService.java
@@ -28,6 +28,25 @@
IPage<Map<String, Object>> selectInspectsList(Page<Object> page, String message);
/**
+ * 鏂板妫�楠屽崟-->閫夋嫨妫�楠岄」鐩増鏈�
+ * @param name
+ * @param mcode
+ * @param specifications
+ * @return
+ */
+ List<Integer> chooseVer(String name, String mcode, String specifications);
+
+ /**
+ * 鏂板妫�楠屽崟-->閫夋嫨妫�楠岄」鐩増鏈�-->鏌ョ湅璇ョ増鏈笅鎴戜滑瑕佸仛鐨勯」鐩姹�
+ * @param name
+ * @param mcode
+ * @param specifications
+ * @param version
+ * @return
+ */
+ List<Map<String,Object>> lookProByVer(String name, String mcode, String specifications, Integer version,String experiment);
+
+ /**
* 鏂板妫�楠岀敵璇疯〃
* @param id
* @param
@@ -59,14 +78,6 @@
*/
String chooseUseProId(Integer id, Integer userProId);
- /**
- * 鏂板妫�楠屽崟-->閫夋嫨妫�楠岄」鐩増鏈�
- * @param name
- * @param mcode
- * @param specifications
- * @return
- */
- List<Map<String,Object>> chooseVer(String name, String mcode, String specifications);
}
--
Gitblit v1.9.3