From d2ce4553e18131b9a60d7be53c496f0cbce699ca Mon Sep 17 00:00:00 2001 From: Fixiaobai <fixiaobai@163.com> Date: 星期五, 08 九月 2023 14:47:47 +0800 Subject: [PATCH] 修改bug --- inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionService.java | 45 +++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 43 insertions(+), 2 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 e95c474..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; @@ -28,6 +29,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 @@ -43,11 +63,32 @@ */ InspectDetailVo selectInspectsListById(Integer id); + /** - * 涓婃姤(鏇存柊妫�楠屽崟妫�楠岀粨鏋�) + * 浣滃簾妫�楠屽崟 * @param id * @return */ - boolean updateInspectsById(Integer id); + String delInspect(Integer id); + + /** + * 淇濆瓨妫�楠岄」鐩矗浠讳汉 + * @param id + * @param userProId + * @return + */ + String chooseUseProId(Integer id, Integer userProId); + + /** + * 淇濆瓨璁惧 + * @param id + * @param equipmentId + * @return + */ + boolean chooseEquipment(Integer id, Integer equipmentId); + + List<Material> getMaterielTypeIsOne(); + + Map<String, Object> getSpecification(Integer id); } -- Gitblit v1.9.3