From e7f7daae5d21ad2988cadd25b6987ca5e7ef8001 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期六, 09 九月 2023 09:51:20 +0800
Subject: [PATCH] 修改bug
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionService.java | 32 +++++++++++++++++++++++++++-----
1 files changed, 27 insertions(+), 5 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..0c29740 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
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yuanchu.limslaboratory.pojo.Inspection;
+import com.yuanchu.limslaboratory.pojo.Material;
import com.yuanchu.limslaboratory.pojo.vo.InspectDetailVo;
import com.yuanchu.limslaboratory.pojo.vo.InspectionVo;
@@ -26,6 +27,25 @@
* @return
*/
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);
/**
* 鏂板妫�楠岀敵璇疯〃
@@ -60,13 +80,15 @@
String chooseUseProId(Integer id, Integer userProId);
/**
- * 鏂板妫�楠屽崟-->閫夋嫨妫�楠岄」鐩増鏈�
- * @param name
- * @param mcode
- * @param specifications
+ * 淇濆瓨璁惧
+ * @param id
+ * @param equipmentId
* @return
*/
- List<Map<String,Object>> chooseVer(String name, String mcode, String specifications);
+ boolean chooseEquipment(Integer id, Integer equipmentId);
+ List<Material> getMaterielTypeIsOne();
+
+ Map<String, Object> getSpecification(Integer id);
}
--
Gitblit v1.9.3