Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-08-30 730443b70de88d328ffa275f51f69280fda979e4

 standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/SpecificationsMapper.java

@@ -1,11 +1,10 @@
package com.yuanchu.limslaboratory.mapper;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.pojo.Specifications;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yuanchu.limslaboratory.vo.ListSpecificationsInformation;
import org.springframework.stereotype.Repository;

import java.util.Map;
import java.util.Objects;
@@ -18,7 +17,14 @@
 * @author 江苏鵷雏网络科技有限公司
 * @since 2023-07-11
 */
@Repository
public interface SpecificationsMapper extends BaseMapper<Specifications> {

    IPage<ListSpecificationsInformation> listSpecificationsInformation(String specificationsName, String serialNumberId, Page<Objects> page);
    Map<String, Object> selectSNameSNName(int materialId);

    IPage<Map<String, Objects>> listSpecificationsInformation(String specificationsName, String serialNumberId, Page<Objects> page);


    //根据型号id查询物料名称
    String selMateName(Integer standardId);
}