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 | 88 ++++++++++++++++++++++++++++++++++++++----- 1 files changed, 77 insertions(+), 11 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 ac69116..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 @@ -1,28 +1,94 @@ package com.yuanchu.limslaboratory.service; -import com.yuanchu.limslaboratory.pojo.Inspection; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.yuanchu.limslaboratory.pojo.dto.InspectionDto; +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; import java.util.List; import java.util.Map; /** - * <p> - * 鏈嶅姟绫� - * </p> + * 鐢宠琛�(Inspection)琛ㄦ湇鍔℃帴鍙� * - * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃 - * @since 2023-07-17 + * @author zss + * @since 2023-08-03 13:03:36 */ public interface InspectionService extends IService<Inspection> { - Inspection addInspection(String userName,int type); - Map selectAllInspection(int pageSize, int countSize, Integer state); + /** + *鏌ヨ妫�楠岀敵璇峰崟鍒楄〃 + * @param page + * @param message + * @return + */ + IPage<Map<String, Object>> selectInspectsList(Page<Object> page, String message); - boolean delInspectionByInsId(String inspectionId); + /** + * 鏂板妫�楠屽崟-->閫夋嫨妫�楠岄」鐩増鏈� + * @param name + * @param mcode + * @param specifications + * @return + */ + List<Integer> chooseVer(String name, String mcode, String specifications); - boolean subInspectionByInsId(String inspectionId); + /** + * 鏂板妫�楠屽崟-->閫夋嫨妫�楠岄」鐩増鏈�-->鏌ョ湅璇ョ増鏈笅鎴戜滑瑕佸仛鐨勯」鐩姹� + * @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 + * @return + */ + Integer addInspect(Integer id, InspectionVo inspectionVo); + + + /** + *鏍规嵁妫�楠屽崟id鏌ヨ鍘熸潗鏂欐楠屽崟璇︽儏 + * @param id + * @return + */ + InspectDetailVo selectInspectsListById(Integer id); + + + /** + * 浣滃簾妫�楠屽崟 + * @param id + * @return + */ + 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