Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-07-27 c6c30ead51b2ac1f7ffd4fb7e4b193c5d11d7bdf

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

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

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.pojo.Product;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

import java.util.List;

import java.util.Map;
import java.util.Objects;

/**
 * <p>
@@ -19,6 +22,10 @@

    List<Product> selectProductByMaterialId(String materialId);

    IPage<Map<String, Object>> pageProductInformation(String productCodeOrName, Integer specificationsId, Page<Objects> page);

    Map<String, Object> selectOneChildren(Object father);

    Map<String, Object> getProductInformation(Integer productId);

    //通过项目名查询项目的试验方法