From c5138faa1c4771bfbc19de5b257e7c129c081cb8 Mon Sep 17 00:00:00 2001 From: Fixiaobai <fixiaobai@163.com> Date: 星期一, 28 八月 2023 13:30:17 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionService.java | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 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 4c2fec0..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 @@ -58,5 +77,7 @@ * @return */ String chooseUseProId(Integer id, Integer userProId); + + } -- Gitblit v1.9.3