From dfea650104b9ad8529fc2df46225c30a0df8c6f5 Mon Sep 17 00:00:00 2001 From: Fixiaobai <fixiaobai@163.com> Date: 星期四, 31 八月 2023 11:57:38 +0800 Subject: [PATCH] 修改 --- laboratory-server/src/main/java/com/yuanchu/limslaboratory/mapper/InstrumentMapper.java | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/mapper/InstrumentMapper.java b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/mapper/InstrumentMapper.java index 9c784a7..d30fe5a 100644 --- a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/mapper/InstrumentMapper.java +++ b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/mapper/InstrumentMapper.java @@ -1,7 +1,15 @@ package com.yuanchu.limslaboratory.mapper; -import com.yuanchu.limslaboratory.entity.Instrument; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.yuanchu.limslaboratory.pojo.ClassAndInsTree; +import com.yuanchu.limslaboratory.pojo.Instrument; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; +import java.util.Objects; /** * <p> @@ -13,4 +21,11 @@ */ public interface InstrumentMapper extends BaseMapper<Instrument> { + IPage<Map<String, Object>> getListInstrumentInformation(Integer conditions,Boolean whetherWhether, String numberOrNameOrSpecifications, Integer classifyId, Page<Objects> page); + + + //鍒嗛厤-->閫夋嫨璁惧 + List<Map<String, Object>> chooseinstum(); + + List<ClassAndInsTree> getInstrument(); } -- Gitblit v1.9.3